diff --git a/.gitmodules b/.gitmodules
index 9501d554..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "libraries/KeyboardioScanner"]
-	path = libraries/KeyboardioScanner
-	url = https://github.com/keyboardio/KeyboardioScanner.git
-[submodule "libraries/HID"]
-	path = libraries/HID
-	url = https://github.com/keyboardio/HID.git
diff --git a/source/KeyboardConfig.cpp b/KeyboardConfig.cpp
similarity index 100%
rename from source/KeyboardConfig.cpp
rename to KeyboardConfig.cpp
diff --git a/source/KeyboardConfig.h b/KeyboardConfig.h
similarity index 90%
rename from source/KeyboardConfig.h
rename to KeyboardConfig.h
index 8933c6a3..649c0463 100644
--- a/source/KeyboardConfig.h
+++ b/KeyboardConfig.h
@@ -2,7 +2,7 @@
 
 
 
-#include "implementation/Model01.h"
+#include "Model01.h"
 
 
 // These global proxy functions are a cheap hack to avoid
diff --git a/source/KeyboardioFirmware.h b/KeyboardioFirmware.h
similarity index 100%
rename from source/KeyboardioFirmware.h
rename to KeyboardioFirmware.h
diff --git a/source/KeyboardioFirmware.ino b/KeyboardioFirmware.ino
similarity index 100%
rename from source/KeyboardioFirmware.ino
rename to KeyboardioFirmware.ino
diff --git a/source/LEDControl.cpp b/LEDControl.cpp
similarity index 100%
rename from source/LEDControl.cpp
rename to LEDControl.cpp
diff --git a/source/LEDControl.h b/LEDControl.h
similarity index 100%
rename from source/LEDControl.h
rename to LEDControl.h
diff --git a/source/Makefile b/Makefile
similarity index 92%
rename from source/Makefile
rename to Makefile
index 31737103..4957fae8 100644
--- a/source/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@ GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always)
 
 ARDUINO_PATH=/Applications/Arduino.app/Contents/Java/
 ARDUINO_TOOLS_PATH=$(ARDUINO_PATH)/hardware/tools
-FQBN=arduino:avr:leonardo
+FQBN=keyboardio:avr:model01
 BUILD_PATH := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'build')
-OUTPUT_PATH=../output
-ARDUINO_LOCAL_LIB_PATH=../libraries
+OUTPUT_PATH=./output
+ARDUINO_LOCAL_LIB_PATH=$(HOME)/Documents/Arduino
 ARDUINO_IDE_VERSION=100607
-VERBOSE= #-verbose
+VERBOSE= -verbose
 SKETCH=KeyboardioFirmware.ino
 
 
@@ -45,6 +45,7 @@ dirs:
 compile: dirs
 	$(ARDUINO_PATH)/arduino-builder \
 		-hardware $(ARDUINO_PATH)/hardware \
+		-hardware $(ARDUINO_LOCAL_LIB_PATH)/hardware \
 		-tools $(ARDUINO_TOOLS_PATH) \
 		-tools $(ARDUINO_PATH)/tools-builder  \
 		-fqbn $(FQBN) \
diff --git a/source/implementation/Model01.cpp b/Model01.cpp
similarity index 100%
rename from source/implementation/Model01.cpp
rename to Model01.cpp
diff --git a/source/implementation/Model01.h b/Model01.h
similarity index 97%
rename from source/implementation/Model01.h
rename to Model01.h
index a7d0046b..4b1dd308 100644
--- a/source/implementation/Model01.h
+++ b/Model01.h
@@ -6,8 +6,8 @@
 #include "KeyboardioScanner.h"
 #include <Wire.h>
 
-#include "../keymaps.h"
-#include "../key_events.h"
+#include "keymaps.h"
+#include "key_events.h"
 
 
 
diff --git a/source/MouseWrapper.cpp b/MouseWrapper.cpp
similarity index 100%
rename from source/MouseWrapper.cpp
rename to MouseWrapper.cpp
diff --git a/source/MouseWrapper.h b/MouseWrapper.h
similarity index 100%
rename from source/MouseWrapper.h
rename to MouseWrapper.h
diff --git a/source/Storage.cpp b/Storage.cpp
similarity index 100%
rename from source/Storage.cpp
rename to Storage.cpp
diff --git a/source/Storage.h b/Storage.h
similarity index 100%
rename from source/Storage.h
rename to Storage.h
diff --git a/source/generated/keymaps.h b/generated/keymaps.h
similarity index 100%
rename from source/generated/keymaps.h
rename to generated/keymaps.h
diff --git a/source/key_defs.h b/key_defs.h
similarity index 100%
rename from source/key_defs.h
rename to key_defs.h
diff --git a/source/key_events.cpp b/key_events.cpp
similarity index 100%
rename from source/key_events.cpp
rename to key_events.cpp
diff --git a/source/key_events.h b/key_events.h
similarity index 100%
rename from source/key_events.h
rename to key_events.h
diff --git a/source/keymaps.h b/keymaps.h
similarity index 100%
rename from source/keymaps.h
rename to keymaps.h
diff --git a/source/keyswitch_state.cpp b/keyswitch_state.cpp
similarity index 100%
rename from source/keyswitch_state.cpp
rename to keyswitch_state.cpp
diff --git a/source/keyswitch_state.h b/keyswitch_state.h
similarity index 100%
rename from source/keyswitch_state.h
rename to keyswitch_state.h
diff --git a/libraries/HID b/libraries/HID
deleted file mode 160000
index 49035065..00000000
--- a/libraries/HID
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 490350650f9b9bf859ae8d16a0a77eab1d362637
diff --git a/libraries/KeyboardioScanner b/libraries/KeyboardioScanner
deleted file mode 160000
index d8ca9f20..00000000
--- a/libraries/KeyboardioScanner
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d8ca9f20791e7f69ce7d66726186f81401193288
diff --git a/source/utils.cpp b/utils.cpp
similarity index 100%
rename from source/utils.cpp
rename to utils.cpp
diff --git a/source/utils.h b/utils.h
similarity index 100%
rename from source/utils.h
rename to utils.h