diff --git a/arduino/BinaryDice/Makefile b/arduino/BinaryDice/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/BinaryDice/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/ConnecticutHalftime/Makefile b/arduino/ConnecticutHalftime/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/ConnecticutHalftime/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/DebounceButton/Makefile b/arduino/DebounceButton/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/DebounceButton/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/DiceWithButton/Makefile b/arduino/DiceWithButton/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/DiceWithButton/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/HelloWorld/Makefile b/arduino/HelloWorld/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/HelloWorld/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/LEDSwitch/Makefile b/arduino/LEDSwitch/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/LEDSwitch/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/MoreReliableSwitch/Makefile b/arduino/MoreReliableSwitch/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/MoreReliableSwitch/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/SerialEcho/Makefile b/arduino/SerialEcho/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/SerialEcho/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/SimpleButton/Makefile b/arduino/SimpleButton/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/SimpleButton/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/UnreliableSwitch/Makefile b/arduino/UnreliableSwitch/Makefile
deleted file mode 120000
index 51c7f30..0000000
--- a/arduino/UnreliableSwitch/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../arduino.mk
\ No newline at end of file
diff --git a/arduino/ConnecticutHalftime/ConnecticutHalftime.ino b/arduino/misc/ConnecticutHalftime/ConnecticutHalftime.ino
similarity index 100%
rename from arduino/ConnecticutHalftime/ConnecticutHalftime.ino
rename to arduino/misc/ConnecticutHalftime/ConnecticutHalftime.ino
diff --git a/arduino/misc/ConnecticutHalftime/Makefile b/arduino/misc/ConnecticutHalftime/Makefile
new file mode 120000
index 0000000..c557791
--- /dev/null
+++ b/arduino/misc/ConnecticutHalftime/Makefile
@@ -0,0 +1 @@
+../../arduino.mk
\ No newline at end of file
diff --git a/arduino/misc/SerialEcho/Makefile b/arduino/misc/SerialEcho/Makefile
new file mode 120000
index 0000000..c557791
--- /dev/null
+++ b/arduino/misc/SerialEcho/Makefile
@@ -0,0 +1 @@
+../../arduino.mk
\ No newline at end of file
diff --git a/arduino/SerialEcho/SerialEcho.ino b/arduino/misc/SerialEcho/SerialEcho.ino
similarity index 100%
rename from arduino/SerialEcho/SerialEcho.ino
rename to arduino/misc/SerialEcho/SerialEcho.ino
diff --git a/arduino/HelloWorld/HelloWorld.ino b/arduino/msaqsg/ch01/HelloWorld/HelloWorld.ino
similarity index 100%
rename from arduino/HelloWorld/HelloWorld.ino
rename to arduino/msaqsg/ch01/HelloWorld/HelloWorld.ino
diff --git a/arduino/msaqsg/ch01/HelloWorld/Makefile b/arduino/msaqsg/ch01/HelloWorld/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch01/HelloWorld/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/LEDSwitch/LEDSwitch.ino b/arduino/msaqsg/ch02/LEDSwitch/LEDSwitch.ino
similarity index 100%
rename from arduino/LEDSwitch/LEDSwitch.ino
rename to arduino/msaqsg/ch02/LEDSwitch/LEDSwitch.ino
diff --git a/arduino/msaqsg/ch02/LEDSwitch/Makefile b/arduino/msaqsg/ch02/LEDSwitch/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch02/LEDSwitch/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/BinaryDice/BinaryDice.ino b/arduino/msaqsg/ch03/BinaryDice/BinaryDice.ino
similarity index 100%
rename from arduino/BinaryDice/BinaryDice.ino
rename to arduino/msaqsg/ch03/BinaryDice/BinaryDice.ino
diff --git a/arduino/msaqsg/ch03/BinaryDice/Makefile b/arduino/msaqsg/ch03/BinaryDice/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch03/BinaryDice/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/DebounceButton/DebounceButton.ino b/arduino/msaqsg/ch03/DebounceButton/DebounceButton.ino
similarity index 100%
rename from arduino/DebounceButton/DebounceButton.ino
rename to arduino/msaqsg/ch03/DebounceButton/DebounceButton.ino
diff --git a/arduino/msaqsg/ch03/DebounceButton/Makefile b/arduino/msaqsg/ch03/DebounceButton/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch03/DebounceButton/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/DiceWithButton/DiceWithButton.ino b/arduino/msaqsg/ch03/DiceWithButton/DiceWithButton.ino
similarity index 100%
rename from arduino/DiceWithButton/DiceWithButton.ino
rename to arduino/msaqsg/ch03/DiceWithButton/DiceWithButton.ino
diff --git a/arduino/msaqsg/ch03/DiceWithButton/Makefile b/arduino/msaqsg/ch03/DiceWithButton/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch03/DiceWithButton/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/msaqsg/ch03/MoreReliableSwitch/Makefile b/arduino/msaqsg/ch03/MoreReliableSwitch/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch03/MoreReliableSwitch/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/MoreReliableSwitch/MoreReliableSwitch.ino b/arduino/msaqsg/ch03/MoreReliableSwitch/MoreReliableSwitch.ino
similarity index 100%
rename from arduino/MoreReliableSwitch/MoreReliableSwitch.ino
rename to arduino/msaqsg/ch03/MoreReliableSwitch/MoreReliableSwitch.ino
diff --git a/arduino/msaqsg/ch03/SimpleButton/Makefile b/arduino/msaqsg/ch03/SimpleButton/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch03/SimpleButton/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/SimpleButton/SimpleButton.ino b/arduino/msaqsg/ch03/SimpleButton/SimpleButton.ino
similarity index 100%
rename from arduino/SimpleButton/SimpleButton.ino
rename to arduino/msaqsg/ch03/SimpleButton/SimpleButton.ino
diff --git a/arduino/msaqsg/ch03/UnreliableSwitch/Makefile b/arduino/msaqsg/ch03/UnreliableSwitch/Makefile
new file mode 120000
index 0000000..bf3dbf5
--- /dev/null
+++ b/arduino/msaqsg/ch03/UnreliableSwitch/Makefile
@@ -0,0 +1 @@
+../../../arduino.mk
\ No newline at end of file
diff --git a/arduino/UnreliableSwitch/UnreliableSwitch.ino b/arduino/msaqsg/ch03/UnreliableSwitch/UnreliableSwitch.ino
similarity index 100%
rename from arduino/UnreliableSwitch/UnreliableSwitch.ino
rename to arduino/msaqsg/ch03/UnreliableSwitch/UnreliableSwitch.ino