diff --git a/chips/atmega1280-hal/avr-atmega1280.json b/avr-specs/avr-atmega1280.json
similarity index 100%
rename from chips/atmega1280-hal/avr-atmega1280.json
rename to avr-specs/avr-atmega1280.json
diff --git a/chips/atmega168-hal/avr-atmega168.json b/avr-specs/avr-atmega168.json
similarity index 100%
rename from chips/atmega168-hal/avr-atmega168.json
rename to avr-specs/avr-atmega168.json
diff --git a/chips/atmega2560-hal/avr-atmega2560.json b/avr-specs/avr-atmega2560.json
similarity index 100%
rename from chips/atmega2560-hal/avr-atmega2560.json
rename to avr-specs/avr-atmega2560.json
diff --git a/chips/atmega328p-hal/avr-atmega328p.json b/avr-specs/avr-atmega328p.json
similarity index 100%
rename from chips/atmega328p-hal/avr-atmega328p.json
rename to avr-specs/avr-atmega328p.json
diff --git a/chips/atmega32u4-hal/avr-atmega32u4.json b/avr-specs/avr-atmega32u4.json
similarity index 100%
rename from chips/atmega32u4-hal/avr-atmega32u4.json
rename to avr-specs/avr-atmega32u4.json
diff --git a/chips/atmega48p-hal/avr-atmega48p.json b/avr-specs/avr-atmega48p.json
similarity index 100%
rename from chips/atmega48p-hal/avr-atmega48p.json
rename to avr-specs/avr-atmega48p.json
diff --git a/chips/attiny85-hal/avr-attiny85.json b/avr-specs/avr-attiny85.json
similarity index 100%
rename from chips/attiny85-hal/avr-attiny85.json
rename to avr-specs/avr-attiny85.json
diff --git a/chips/attiny88-hal/avr-attiny88.json b/avr-specs/avr-attiny88.json
similarity index 100%
rename from chips/attiny88-hal/avr-attiny88.json
rename to avr-specs/avr-attiny88.json
diff --git a/boards/arduino-diecimila/.cargo/config.toml b/boards/arduino-diecimila/.cargo/config.toml
index 29bc032050..7dd47dddac 100644
--- a/boards/arduino-diecimila/.cargo/config.toml
+++ b/boards/arduino-diecimila/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-atmega168.json"
+target = "../../avr-specs/avr-atmega168.json"
 
 [unstable]
 build-std = ["core"]
diff --git a/boards/arduino-diecimila/avr-atmega168.json b/boards/arduino-diecimila/avr-atmega168.json
deleted file mode 120000
index 3fa24bcdd3..0000000000
--- a/boards/arduino-diecimila/avr-atmega168.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/atmega168-hal/avr-atmega168.json
\ No newline at end of file
diff --git a/boards/arduino-leonardo/.cargo/config.toml b/boards/arduino-leonardo/.cargo/config.toml
index 4d7eb7b6aa..c2c7b54e4f 100644
--- a/boards/arduino-leonardo/.cargo/config.toml
+++ b/boards/arduino-leonardo/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-atmega32u4.json"
+target = "../../avr-specs/avr-atmega32u4.json"
 
 [target.'cfg(target_arch = "avr")']
 runner = "./leonardo-runner.sh"
diff --git a/boards/arduino-leonardo/avr-atmega32u4.json b/boards/arduino-leonardo/avr-atmega32u4.json
deleted file mode 120000
index 00f5c22417..0000000000
--- a/boards/arduino-leonardo/avr-atmega32u4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/atmega32u4-hal/avr-atmega32u4.json
\ No newline at end of file
diff --git a/boards/arduino-mega2560/.cargo/config.toml b/boards/arduino-mega2560/.cargo/config.toml
index 3a3d84615b..0f2cde0270 100644
--- a/boards/arduino-mega2560/.cargo/config.toml
+++ b/boards/arduino-mega2560/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-atmega2560.json"
+target = "../../avr-specs/avr-atmega2560.json"
 
 [unstable]
 build-std = ["core"]
diff --git a/boards/arduino-mega2560/avr-atmega2560.json b/boards/arduino-mega2560/avr-atmega2560.json
deleted file mode 120000
index 4ad7cf8d3a..0000000000
--- a/boards/arduino-mega2560/avr-atmega2560.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/atmega2560-hal/avr-atmega2560.json
\ No newline at end of file
diff --git a/boards/arduino-uno/.cargo/config.toml b/boards/arduino-uno/.cargo/config.toml
index 26730bb069..39e545baaf 100644
--- a/boards/arduino-uno/.cargo/config.toml
+++ b/boards/arduino-uno/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-atmega328p.json"
+target = "../../avr-specs/avr-atmega328p.json"
 
 [target.'cfg(target_arch = "avr")']
 runner = "./uno-runner.sh"
diff --git a/boards/arduino-uno/avr-atmega328p.json b/boards/arduino-uno/avr-atmega328p.json
deleted file mode 120000
index 61b2882d90..0000000000
--- a/boards/arduino-uno/avr-atmega328p.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/atmega328p-hal/avr-atmega328p.json
\ No newline at end of file
diff --git a/boards/bigavr6/.cargo/config.toml b/boards/bigavr6/.cargo/config.toml
index bb137997bf..7b7798dad7 100644
--- a/boards/bigavr6/.cargo/config.toml
+++ b/boards/bigavr6/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-atmega1280.json"
+target = "../../avr-specs/avr-atmega1280.json"
 
 [unstable]
 build-std = ["core"]
diff --git a/boards/bigavr6/avr-atmega1280.json b/boards/bigavr6/avr-atmega1280.json
deleted file mode 120000
index dc8ce0fa35..0000000000
--- a/boards/bigavr6/avr-atmega1280.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/atmega1280-hal/avr-atmega1280.json
\ No newline at end of file
diff --git a/boards/sparkfun-pro-micro/.cargo/config.toml b/boards/sparkfun-pro-micro/.cargo/config.toml
index dae1e0dd8b..d3f1f603a7 100644
--- a/boards/sparkfun-pro-micro/.cargo/config.toml
+++ b/boards/sparkfun-pro-micro/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-atmega32u4.json"
+target = "../../avr-specs/avr-atmega32u4.json"
 
 [target.'cfg(target_arch = "avr")']
 runner = "./pro-micro-runner.sh"
diff --git a/boards/sparkfun-pro-micro/avr-atmega32u4.json b/boards/sparkfun-pro-micro/avr-atmega32u4.json
deleted file mode 120000
index 00f5c22417..0000000000
--- a/boards/sparkfun-pro-micro/avr-atmega32u4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/atmega32u4-hal/avr-atmega32u4.json
\ No newline at end of file
diff --git a/boards/trinket/.cargo/config.toml b/boards/trinket/.cargo/config.toml
index ce381552fe..2c263eb609 100644
--- a/boards/trinket/.cargo/config.toml
+++ b/boards/trinket/.cargo/config.toml
@@ -1,5 +1,5 @@
 [build]
-target = "avr-attiny85.json"
+target = "../../avr-specs/avr-attiny85.json"
 
 [unstable]
 build-std = ["core"]
diff --git a/boards/trinket/avr-attiny85.json b/boards/trinket/avr-attiny85.json
deleted file mode 120000
index 44934431e5..0000000000
--- a/boards/trinket/avr-attiny85.json
+++ /dev/null
@@ -1 +0,0 @@
-../../chips/attiny85-hal/avr-attiny85.json
\ No newline at end of file
diff --git a/chips/atmega1280-hal/.cargo/config.toml b/chips/atmega1280-hal/.cargo/config.toml
new file mode 100644
index 0000000000..7b7798dad7
--- /dev/null
+++ b/chips/atmega1280-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-atmega1280.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/atmega168-hal/.cargo/config.toml b/chips/atmega168-hal/.cargo/config.toml
new file mode 100644
index 0000000000..7dd47dddac
--- /dev/null
+++ b/chips/atmega168-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-atmega168.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/atmega2560-hal/.cargo/config.toml b/chips/atmega2560-hal/.cargo/config.toml
new file mode 100644
index 0000000000..0f2cde0270
--- /dev/null
+++ b/chips/atmega2560-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-atmega2560.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/atmega328p-hal/.cargo/config.toml b/chips/atmega328p-hal/.cargo/config.toml
new file mode 100644
index 0000000000..6fe8cd07b9
--- /dev/null
+++ b/chips/atmega328p-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-atmega328p.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/atmega32u4-hal/.cargo/config.toml b/chips/atmega32u4-hal/.cargo/config.toml
new file mode 100644
index 0000000000..8af9492377
--- /dev/null
+++ b/chips/atmega32u4-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-atmega32u4.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/atmega48p-hal/.cargo/config.toml b/chips/atmega48p-hal/.cargo/config.toml
new file mode 100644
index 0000000000..ac2d93baa8
--- /dev/null
+++ b/chips/atmega48p-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-atmega48p.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/attiny85-hal/.cargo/config.toml b/chips/attiny85-hal/.cargo/config.toml
new file mode 100644
index 0000000000..2c263eb609
--- /dev/null
+++ b/chips/attiny85-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-attiny85.json"
+
+[unstable]
+build-std = ["core"]
diff --git a/chips/attiny88-hal/.cargo/config.toml b/chips/attiny88-hal/.cargo/config.toml
new file mode 100644
index 0000000000..cde74612f4
--- /dev/null
+++ b/chips/attiny88-hal/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "../../avr-specs/avr-attiny88.json"
+
+[unstable]
+build-std = ["core"]