diff --git a/watch/bluetooth.h b/src/core/bluetooth.h
similarity index 100%
rename from watch/bluetooth.h
rename to src/core/bluetooth.h
diff --git a/watch/drawUtils.h b/src/core/drawUtils.h
similarity index 100%
rename from watch/drawUtils.h
rename to src/core/drawUtils.h
diff --git a/watch/images.h b/src/core/images.h
similarity index 100%
rename from watch/images.h
rename to src/core/images.h
diff --git a/watch/notes.h b/src/core/notes.h
similarity index 100%
rename from watch/notes.h
rename to src/core/notes.h
diff --git a/watch/notifications.h b/src/core/notifications.h
similarity index 100%
rename from watch/notifications.h
rename to src/core/notifications.h
diff --git a/watch/screen.h b/src/core/screen.h
similarity index 100%
rename from watch/screen.h
rename to src/core/screen.h
diff --git a/watch/topbar.h b/src/core/topbar.h
similarity index 100%
rename from watch/topbar.h
rename to src/core/topbar.h
diff --git a/watch/utils.h b/src/core/utils.h
similarity index 100%
rename from watch/utils.h
rename to src/core/utils.h
diff --git a/watch/watch.h b/src/core/watch.h
similarity index 100%
rename from watch/watch.h
rename to src/core/watch.h
diff --git a/watch/watchcore.cpp b/src/core/watchcore.cpp
similarity index 100%
rename from watch/watchcore.cpp
rename to src/core/watchcore.cpp
diff --git a/watch/watchcore.h b/src/core/watchcore.h
similarity index 100%
rename from watch/watchcore.h
rename to src/core/watchcore.h
diff --git a/watch/alarmSet.h b/src/screens/alarmSet.h
similarity index 100%
rename from watch/alarmSet.h
rename to src/screens/alarmSet.h
diff --git a/watch/selectScreen.h b/src/screens/selectScreen.h
similarity index 100%
rename from watch/selectScreen.h
rename to src/screens/selectScreen.h
diff --git a/watch/settings.h b/src/screens/settings.h
similarity index 100%
rename from watch/settings.h
rename to src/screens/settings.h
diff --git a/watch/test.h b/src/screens/test.h
similarity index 100%
rename from watch/test.h
rename to src/screens/test.h
diff --git a/watch/tfl.h b/src/screens/tfl.h
similarity index 100%
rename from watch/tfl.h
rename to src/screens/tfl.h
diff --git a/watch/top10.h b/src/screens/top10.h
similarity index 100%
rename from watch/top10.h
rename to src/screens/top10.h
diff --git a/watch/twitter.h b/src/screens/twitter.h
similarity index 100%
rename from watch/twitter.h
rename to src/screens/twitter.h
diff --git a/watch/weather.h b/src/screens/weather.h
similarity index 100%
rename from watch/weather.h
rename to src/screens/weather.h
diff --git a/watch/watch.ino b/src/watch/watch.ino
similarity index 97%
rename from watch/watch.ino
rename to src/watch/watch.ino
index 6f011a3..0943cee 100644
--- a/watch/watch.ino
+++ b/src/watch/watch.ino
@@ -10,7 +10,7 @@
                      // powerDown example code: http://hwstartup.wordpress.com/2013/04/15/how-to-run-an-arduino-clone-on-aa-batteries-for-over-a-year-part-2/
 
 #include <SoftwareSerial.h>
-#include "watchcore.h"
+#include <watchcore.h>
 /*int main(void) {
    init(); // don't forget this!
    sysinit();