diff --git a/Apps/System/menu.c b/Apps/System/menu.c
index b0e917db..0dc15987 100644
--- a/Apps/System/menu.c
+++ b/Apps/System/menu.c
@@ -6,8 +6,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "menu.h"
 
 static list_head _res_list_head = LIST_HEAD(_res_list_head);
diff --git a/Apps/System/notification.c b/Apps/System/notification.c
index 92b52ea2..9d29d41b 100644
--- a/Apps/System/notification.c
+++ b/Apps/System/notification.c
@@ -5,8 +5,7 @@
  * Author: Carson Katri <me@carsonkatri.com>
  *         Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "notification.h"
 #include "notification_layer.h"
 #include "librebble.h"
diff --git a/Apps/System/notification.h b/Apps/System/notification.h
index bfe7bc24..ab088dae 100644
--- a/Apps/System/notification.h
+++ b/Apps/System/notification.h
@@ -6,7 +6,6 @@
  * Author: Carson Katri <me@carsonkatri.com>.
  */
 
-#include "rebbleos.h"
 #include "librebble.h"
 #include "display.h"
 #include "backlight.h"
diff --git a/Apps/System/systemapp.c b/Apps/System/systemapp.c
index 4628f06c..381722af 100644
--- a/Apps/System/systemapp.c
+++ b/Apps/System/systemapp.c
@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"
diff --git a/Apps/System/testapp.c b/Apps/System/testapp.c
index cc251a7f..20aacdec 100644
--- a/Apps/System/testapp.c
+++ b/Apps/System/testapp.c
@@ -5,8 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "test_defs.h"
diff --git a/Apps/System/tests/color_test.c b/Apps/System/tests/color_test.c
index 0944419c..778861c8 100644
--- a/Apps/System/tests/color_test.c
+++ b/Apps/System/tests/color_test.c
@@ -4,7 +4,7 @@
  *
  * Author: Author: Chris Multhaupt <chris.multhaupt@gmail.com>.
  */
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"
diff --git a/Apps/System/tests/overlay_test.c b/Apps/System/tests/overlay_test.c
index 3a53be9e..bfb1144f 100644
--- a/Apps/System/tests/overlay_test.c
+++ b/Apps/System/tests/overlay_test.c
@@ -4,8 +4,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"
diff --git a/Apps/System/tests/test_test.c b/Apps/System/tests/test_test.c
index d2c4b5be..30d96b07 100644
--- a/Apps/System/tests/test_test.c
+++ b/Apps/System/tests/test_test.c
@@ -1,4 +1,4 @@
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"
diff --git a/Apps/System/tests/vibes_test.c b/Apps/System/tests/vibes_test.c
index dca97a08..5e07bd28 100644
--- a/Apps/System/tests/vibes_test.c
+++ b/Apps/System/tests/vibes_test.c
@@ -4,8 +4,7 @@
  *
  * Author: Author: Elliot Hawkins <elliotshawkins@gmail.com>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"
diff --git a/Apps/System/widgettest.c b/Apps/System/widgettest.c
index a3ce1cb6..50d0c055 100644
--- a/Apps/System/widgettest.c
+++ b/Apps/System/widgettest.c
@@ -4,8 +4,7 @@
  *
  * Author: Carson Katri <me@carsonkatri.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "test.h"
 #include "librebble.h"
 #include "bitmap_layer.h"
diff --git a/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c b/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c
index ed5f0825..b25b51ff 100644
--- a/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c
+++ b/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c
@@ -8,7 +8,8 @@
 #include "btstack_rebble.h"
 #include "btstack_chipset_cc256x.h"
 #include "hal_uart_dma.h"
-#include "rebbleos.h"
+#include "main.h"
+#include "init.h"
 #include "btstack_spp.h"
 #include "hal_time_ms.h"
 #include "rbl_bluetooth.h"
diff --git a/hw/platform/chalk/chalk_bluetooth.c b/hw/platform/chalk/chalk_bluetooth.c
index e80f5509..1666cca6 100644
--- a/hw/platform/chalk/chalk_bluetooth.c
+++ b/hw/platform/chalk/chalk_bluetooth.c
@@ -1,4 +1,5 @@
-#include "rebbleos.h"
+#include "rbl_bluetooth.h"
+#include "init.h"
 
 /*
  * NOT IMPLEMENTED
diff --git a/hw/platform/qemu/hw_qemu.c b/hw/platform/qemu/hw_qemu.c
index 30de34f5..27c17dde 100644
--- a/hw/platform/qemu/hw_qemu.c
+++ b/hw/platform/qemu/hw_qemu.c
@@ -3,7 +3,6 @@
 #include "hw_qemu.h"
 #include "stm32_usart.h"
 #include "stm32_power.h"
-#include "rebbleos.h"
 
 void _hw_qemu_rx(void);
 
diff --git a/rcore/api_func_symbols.h b/rcore/api_func_symbols.h
index 3c3723de..9cb85dd6 100644
--- a/rcore/api_func_symbols.h
+++ b/rcore/api_func_symbols.h
@@ -1,5 +1,4 @@
 #include "common.h"
-#include "rebbleos.h"
 #include "librebble.h"
 #include "graphics_wrapper.h"
 #include "battery_state_service.h"
diff --git a/rcore/appmanager.c b/rcore/appmanager.c
index aecb4c43..2fbfbef2 100644
--- a/rcore/appmanager.c
+++ b/rcore/appmanager.c
@@ -6,9 +6,9 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
+#include "rebble_memory.h"
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "librebble.h"
 #include "appmanager.h"
 #include "systemapp.h"
diff --git a/rcore/appmanager_app.c b/rcore/appmanager_app.c
index 84e110f8..b4451702 100644
--- a/rcore/appmanager_app.c
+++ b/rcore/appmanager_app.c
@@ -7,7 +7,7 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
 #include "systemapp.h"
 #include "widgettest.h"
diff --git a/rcore/appmanager_app_api.c b/rcore/appmanager_app_api.c
index c04714f2..b6c5b89a 100644
--- a/rcore/appmanager_app_api.c
+++ b/rcore/appmanager_app_api.c
@@ -6,8 +6,9 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "protocol.h"
 #include "protocol_music.h"
diff --git a/rcore/appmanager_app_runloop.c b/rcore/appmanager_app_runloop.c
index 6ecdcb04..a4306742 100644
--- a/rcore/appmanager_app_runloop.c
+++ b/rcore/appmanager_app_runloop.c
@@ -6,14 +6,16 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "notification_manager.h"
 #include "timers.h"
 #include "ngfxwrap.h"
 #include "event_service.h"
 
+
 /* Configure Logging */
 #define MODULE_NAME "apploop"
 #define MODULE_TYPE "APLOOP"
diff --git a/rcore/appmanager_app_timer.c b/rcore/appmanager_app_timer.c
index 047ed37e..4efd8741 100644
--- a/rcore/appmanager_app_timer.c
+++ b/rcore/appmanager_app_timer.c
@@ -7,8 +7,9 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "notification_manager.h"
 
diff --git a/rcore/bluetooth.c b/rcore/bluetooth.c
index 0e2dc55a..018991b9 100644
--- a/rcore/bluetooth.c
+++ b/rcore/bluetooth.c
@@ -32,7 +32,7 @@
 #include "backlight.h"
 #include "ambient.h"
 #include "rebble_memory.h"
-#include "rebbleos.h"
+#include "init.h"
 #include "rbl_bluetooth.h"
 #include "pebble_protocol.h"
 #include "stdarg.h"
diff --git a/rcore/buttons.h b/rcore/buttons.h
index 947915fd..832d4920 100644
--- a/rcore/buttons.h
+++ b/rcore/buttons.h
@@ -7,7 +7,7 @@
  */
 
 #include "FreeRTOS.h"
-#include "rebbleos.h"
+// not ideal. TODO reorg
 #include "librebble.h"
 
 #define butDEBOUNCE_DELAY       ( pdMS_TO_TICKS(2) )
diff --git a/rcore/display.c b/rcore/display.c
index 55a357c4..314dc2a7 100644
--- a/rcore/display.c
+++ b/rcore/display.c
@@ -15,10 +15,10 @@
  *   This must be run in the scheduler, not before.
  *  
  */
- 
-#include "rebbleos.h"
+#include "display.h"
+#include "init.h"
 #include "appmanager.h"
-
+#include "semphr.h"
 /* Semaphore to start drawing */
 static SemaphoreHandle_t _display_start_sem;
 static StaticSemaphore_t _display_start_sem_buf;
diff --git a/rcore/flash.c b/rcore/flash.c
index e4deac99..7ae64dae 100644
--- a/rcore/flash.c
+++ b/rcore/flash.c
@@ -4,9 +4,9 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "platform.h"
+#include "semphr.h"
 #include "flash.h"
 #include "fs.h"
 
diff --git a/rcore/gyro.c b/rcore/gyro.c
index f81a926c..957b13ad 100644
--- a/rcore/gyro.c
+++ b/rcore/gyro.c
@@ -4,5 +4,4 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
diff --git a/rcore/init.h b/rcore/init.h
new file mode 100644
index 00000000..a1fc347b
--- /dev/null
+++ b/rcore/init.h
@@ -0,0 +1,28 @@
+#pragma once
+/* init.h
+ * routines for [...]
+ * RebbleOS
+ */
+//Let's make sure the user is using an 'up to date' version of the compiler
+
+
+#define VERSION "v0.0.0.2"
+
+#if __GNUC__ < 8
+    #error It appears you are using a version of arm-none-eabi-gcc that is incompatible with with the RebbleOS project. \
+    Please find an updated version by using your respective package manager or going to the developer.arm.com download page.
+#endif
+
+
+
+// Reset the watchdog timer manually
+void watchdog_reset(void);
+
+
+void rebbleos_init(void);
+void os_module_init_complete(uint8_t result);
+
+#define INIT_RESP_OK            0
+#define INIT_RESP_ASYNC_WAIT    1
+#define INIT_RESP_NOT_SUPPORTED 2
+#define INIT_RESP_ERROR         3 
diff --git a/rcore/log.c b/rcore/log.c
index 873e10c8..80ee1c39 100644
--- a/rcore/log.c
+++ b/rcore/log.c
@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "main.h"
 
 extern int vsfmt(char *buf, unsigned int len, const char *ifmt, va_list ap);
 
diff --git a/rcore/main.c b/rcore/main.c
index e7b410bf..d78cc665 100644
--- a/rcore/main.c
+++ b/rcore/main.c
@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "main.h"
 #include "watchdog.h"
 #include "ambient.h"
 
diff --git a/rcore/notification_manager.c b/rcore/notification_manager.c
index 1e22f176..364c3f0f 100644
--- a/rcore/notification_manager.c
+++ b/rcore/notification_manager.c
@@ -5,7 +5,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"
 #include "overlay_manager.h"
diff --git a/rcore/overlay_manager.c b/rcore/overlay_manager.c
index d658c4e3..ac59b837 100644
--- a/rcore/overlay_manager.c
+++ b/rcore/overlay_manager.c
@@ -4,7 +4,8 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-#include "rebbleos.h"
+#include "main.h"
+#include "init.h"
 #include "ngfxwrap.h"
 #include "overlay_manager.h"
 #include "protocol.h"
diff --git a/rcore/overlay_manager.h b/rcore/overlay_manager.h
index 077a2434..9a80347d 100644
--- a/rcore/overlay_manager.h
+++ b/rcore/overlay_manager.h
@@ -22,7 +22,7 @@
  * Window creation happens in a callback so we can delegate the work to our thread
  * and constrain memory and runtime of the window
  */
-#include "rebbleos.h"
+#include "overlay_manager.h"
 
 /* NOT USED YET */
 typedef enum OverlayMode {
diff --git a/rcore/power.c b/rcore/power.c
index 9b5abbbb..63add4e2 100644
--- a/rcore/power.c
+++ b/rcore/power.c
@@ -4,11 +4,12 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
+#include "main.h"
 #include <stdbool.h>
 #include "power.h"
-#include "rebbleos.h"
 #include "notification_manager.h"
 #include "battery_state_service.h"
+#include "flash.h"
 
 static uint8_t _charge_mode_prev = 0;
 static uint8_t _charge_mode = 0;
diff --git a/rcore/protocol/protocol.c b/rcore/protocol/protocol.c
index 5f64bd59..c152ec57 100644
--- a/rcore/protocol/protocol.c
+++ b/rcore/protocol/protocol.c
@@ -5,7 +5,7 @@
  * Author: Barry Carter <barry.carter@gmail.com>
  */
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "main.h"
 #include "endpoint.h"
 #include "protocol.h"
 #include "pebble_protocol.h"
diff --git a/rcore/protocol/protocol_app.c b/rcore/protocol/protocol_app.c
index 09a021d1..97b39fb2 100644
--- a/rcore/protocol/protocol_app.c
+++ b/rcore/protocol/protocol_app.c
@@ -5,7 +5,7 @@
  * Author: Barry Carter <barry.carter@gmail.com>
  */
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "protocol_service.h"
diff --git a/rcore/protocol/protocol_blob.c b/rcore/protocol/protocol_blob.c
index 13e7bcd2..7115400e 100644
--- a/rcore/protocol/protocol_blob.c
+++ b/rcore/protocol/protocol_blob.c
@@ -4,7 +4,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "protocol_service.h"
diff --git a/rcore/protocol/protocol_call.c b/rcore/protocol/protocol_call.c
index 08b53aa2..d110572a 100644
--- a/rcore/protocol/protocol_call.c
+++ b/rcore/protocol/protocol_call.c
@@ -4,11 +4,13 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-#include "rebbleos.h"
+#include <stdint.h>
+#include "log.h"
 #include "protocol.h"
 #include "pebble_protocol.h"
 #include "protocol_service.h"
 #include "event_service.h"
+#include <string.h>
 
 /* Configure Logging */
 #define MODULE_NAME "p-call"
diff --git a/rcore/protocol/protocol_music.c b/rcore/protocol/protocol_music.c
index 53851382..be2513e1 100644
--- a/rcore/protocol/protocol_music.c
+++ b/rcore/protocol/protocol_music.c
@@ -4,7 +4,8 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-#include "rebbleos.h"
+#include <stdint.h>
+#include "log.h"
 #include "protocol.h"
 #include "pebble_protocol.h"
 #include "protocol_service.h"
diff --git a/rcore/protocol/protocol_notification.c b/rcore/protocol/protocol_notification.c
index c6021dd1..a7fac495 100644
--- a/rcore/protocol/protocol_notification.c
+++ b/rcore/protocol/protocol_notification.c
@@ -4,8 +4,8 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
+#include "main.h"
 #include <stdlib.h>
-#include "rebbleos.h"
 #include "appmanager.h"
 #include "test.h"
 #include "protocol.h"
diff --git a/rcore/protocol/protocol_system.c b/rcore/protocol/protocol_system.c
index 59515e03..d2f492dd 100644
--- a/rcore/protocol/protocol_system.c
+++ b/rcore/protocol/protocol_system.c
@@ -4,7 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
diff --git a/rcore/protocol/protocol_transfer.c b/rcore/protocol/protocol_transfer.c
index c7a5bd45..ffcb41cf 100644
--- a/rcore/protocol/protocol_transfer.c
+++ b/rcore/protocol/protocol_transfer.c
@@ -15,8 +15,9 @@
  * Each request requires an (N)ACK
  */
 #include <stdlib.h>
-#include "rebbleos.h"
-#include "protocol_system.h"
+#include <stdint.h>
+#include "main.h"
+#include "notification_manager.h"
 #include "pebble_protocol.h"
 #include "protocol_service.h"
 #include "notification_manager.h"
diff --git a/rcore/qemu.c b/rcore/qemu.c
index 29ce1ba3..06ef2aaf 100644
--- a/rcore/qemu.c
+++ b/rcore/qemu.c
@@ -9,11 +9,12 @@
 #include "FreeRTOS.h"
 #include "task.h"
 #include "log.h"
-#include "rebbleos.h"
+#include "init.h"
 #include "endpoint.h"
 #include "protocol.h"
 #include "protocol_service.h"
 
+#include "semphr.h"
 /* Configure Logging */
 #define MODULE_NAME "qemu"
 #define MODULE_TYPE "SYS"
diff --git a/rcore/rebble_memory.c b/rcore/rebble_memory.c
index f8d2363f..45f247d0 100644
--- a/rcore/rebble_memory.c
+++ b/rcore/rebble_memory.c
@@ -5,8 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "main.h"
 
 /* Configure Logging */
 #define MODULE_NAME "mem"
diff --git a/rcore/rebble_memory.h b/rcore/rebble_memory.h
index 52d55685..3bc1ac15 100644
--- a/rcore/rebble_memory.h
+++ b/rcore/rebble_memory.h
@@ -8,6 +8,7 @@
  */
 
 #include "FreeRTOS.h"
+#include "semphr.h"
 #include <string.h>
 #include <stdlib.h>
 #include "stdbool.h"
diff --git a/rcore/rebble_time.c b/rcore/rebble_time.c
index be91a25a..fa67401a 100644
--- a/rcore/rebble_time.c
+++ b/rcore/rebble_time.c
@@ -4,8 +4,7 @@
  *
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
-
-#include "rebbleos.h"
+#include "main.h"
 #include "strftime.h"
 
 /* Configure Logging */
diff --git a/rcore/rebble_util.c b/rcore/rebble_util.c
index 1c68292c..ecc7062e 100644
--- a/rcore/rebble_util.c
+++ b/rcore/rebble_util.c
@@ -1,4 +1,4 @@
-#include "rebbleos.h"
+#include "display.h"
 #include "librebble.h"
 #include "uuid.h"
 
diff --git a/rcore/rebbleos.c b/rcore/rebbleos.c
index 0d48ef0a..fcaba9b4 100644
--- a/rcore/rebbleos.c
+++ b/rcore/rebbleos.c
@@ -4,11 +4,13 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "stdio.h"
-#include "rebbleos.h"
+#include "rbl_bluetooth.h"
+#include "settings.h"
+#include "init.h"
 #include "watchdog.h"
 #include "ngfxwrap.h"
 #include "overlay_manager.h"
@@ -18,6 +20,7 @@
 #include "protocol_service.h"
 #include "rtoswrap.h"
 #include "test.h"
+#include "flash.h"
 
 typedef uint8_t (*mod_callback)(void);
 // static TaskHandle_t _os_task;
diff --git a/rcore/rebbleos.h b/rcore/rebbleos.h
deleted file mode 100644
index f1c58495..00000000
--- a/rcore/rebbleos.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-/* rebbleos.h
- * routines for [...]
- * RebbleOS
- *
- * Author: Barry Carter <barry.carter@gmail.com>
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include "FreeRTOS.h"
-#include "rebble_memory.h"
-#include "platform.h"
-#include "appmanager.h"
-#include "ambient.h"
-#include "task.h"
-#include "semphr.h"
-#include "display.h"
-#include "rebble_time.h"
-#include "main.h"
-#include "log.h"
-#include "debug.h"
-#include "flash.h"
-#include "resource.h"
-#include "rebble_util.h"
-#include "rbl_bluetooth.h"
-
-#define VERSION "v0.0.0.2"
-
-//Let's make sure the user is using an 'up to date' version of the compiler
-
-#if __GNUC__ < 8
-    #error It appears you are using a version of arm-none-eabi-gcc that is incompatible with with the RebbleOS project. \
-    Please find an updated version by using your respective package manager or going to the developer.arm.com download page.
-#endif
-
-// Public API functions as exposed through the various layers
-
-// Reset the watchdog timer manually
-void watchdog_reset(void);
-
-
-
-typedef struct SystemSettings {
-    uint16_t backlight_intensity;
-    uint16_t backlight_on_time;
-    uint16_t vibrate_intensity;
-    uint16_t vibrate_pattern;
-    // may need 16t
-    uint8_t modules_enabled_flag;
-    uint8_t modules_error_flag;
-} SystemSettings;
-
-void rebbleos_init(void);
-void os_module_init_complete(uint8_t result);
-SystemSettings *rebbleos_get_settings(void);
-
-#define INIT_RESP_OK            0
-#define INIT_RESP_ASYNC_WAIT    1
-#define INIT_RESP_NOT_SUPPORTED 2
-#define INIT_RESP_ERROR         3
diff --git a/rcore/resource.c b/rcore/resource.c
index 0bcf1de5..492764c0 100644
--- a/rcore/resource.c
+++ b/rcore/resource.c
@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "main.h"
 #include "platform.h"
 #include "flash.h"
 
diff --git a/rcore/service/blobdb.c b/rcore/service/blobdb.c
index e1fdc057..10141953 100644
--- a/rcore/service/blobdb.c
+++ b/rcore/service/blobdb.c
@@ -6,11 +6,18 @@
  * Authors: Barry Carter <barry.carter@gmail.com>
  *          Joshua Wise <joshua@joshuawise.com>
  */
-#include "rebbleos.h"
+#include <stdint.h>
+#include "FreeRTOS.h"
+#include "platform.h"
+#include "semphr.h"
+#include "ambient.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "node_list.h"
 #include "timeline.h"
+#include <string.h>
+#include "task.h"
+#include "log.h"
 #include "blobdb.h"
 
 /* Configure Logging */
diff --git a/rcore/service/blobdb_test.c b/rcore/service/blobdb_test.c
index a2f692ee..eb631ec2 100644
--- a/rcore/service/blobdb_test.c
+++ b/rcore/service/blobdb_test.c
@@ -2,13 +2,14 @@
  * tests for blob database
  * RebbleOS
  */
-#include "rebbleos.h"
+#include <stdint.h>
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "node_list.h"
 #include "timeline.h"
 #include "blobdb.h"
 #include "test.h"
+#include "log.h"
 #include "debug.h"
 
 #define MODULE_NAME "blobdb"
diff --git a/rcore/service/protocol_service.c b/rcore/service/protocol_service.c
index b2881cac..fb9b4ac5 100644
--- a/rcore/service/protocol_service.c
+++ b/rcore/service/protocol_service.c
@@ -10,13 +10,17 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-#include "rebbleos.h"
+#include <stdint.h>
 #include "protocol_system.h"
 #include "protocol_service.h"
 #include "pebble_protocol.h"
 #include "timeline.h"
 #include "FreeRTOS.h"
 #include "rtoswrap.h"
+#include <string.h>
+#include "log.h"
+#include "qalloc.h"
+
 /* Configure Logging */
 #define MODULE_NAME "pcolsvc"
 #define MODULE_TYPE "KERN"
diff --git a/rcore/service/timeline.c b/rcore/service/timeline.c
index 98450670..20252985 100644
--- a/rcore/service/timeline.c
+++ b/rcore/service/timeline.c
@@ -5,7 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_system.h"
 #include "protocol_service.h"
 #include "pebble_protocol.h"
diff --git a/rcore/settings.h b/rcore/settings.h
new file mode 100644
index 00000000..bae1ab7a
--- /dev/null
+++ b/rcore/settings.h
@@ -0,0 +1,16 @@
+/* settings.h
+ * settings for [...]
+ * RebbleOS
+ */ 
+typedef struct SystemSettings {
+    uint16_t backlight_intensity;
+    uint16_t backlight_on_time;
+    uint16_t vibrate_intensity;
+    uint16_t vibrate_pattern;
+    // may need 16t
+    uint8_t modules_enabled_flag;
+    uint8_t modules_error_flag;
+} SystemSettings;
+
+SystemSettings *rebbleos_get_settings(void);
+
diff --git a/rcore/test.c b/rcore/test.c
index 6e5ada47..dbf21120 100644
--- a/rcore/test.c
+++ b/rcore/test.c
@@ -1,5 +1,6 @@
 #include "test.h"
-#include "rebbleos.h"
+#include "main.h"
+#include "init.h"
 #include "protocol.h"
 #include "protocol_service.h"
 #include "rtoswrap.h"
diff --git a/rwatch/event/app_timer.c b/rwatch/event/app_timer.c
index ec3a26f6..4e23bd9a 100644
--- a/rwatch/event/app_timer.c
+++ b/rwatch/event/app_timer.c
@@ -4,7 +4,7 @@
  *
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
-#include "rebbleos.h"
+#include "main.h"
 #include "app_timer.h"
 #include "appmanager.h"
 #include "task.h"
diff --git a/rwatch/event/battery_state_service.c b/rwatch/event/battery_state_service.c
index 5088bf56..1decfe05 100644
--- a/rwatch/event/battery_state_service.c
+++ b/rwatch/event/battery_state_service.c
@@ -4,7 +4,7 @@
  * Author: Barry Carter <barry.carter@gmail.com>
  *
  */
-
+#include "main.h"
 #include "librebble.h"
 #include "ngfxwrap.h"
 #include "battery_state_service.h"
diff --git a/rwatch/event/connection_service.c b/rwatch/event/connection_service.c
index 7b3cf21e..e5173574 100644
--- a/rwatch/event/connection_service.c
+++ b/rwatch/event/connection_service.c
@@ -9,6 +9,7 @@
 #include "event_service.h"
 #include "event_service.h"
 #include "connection_service.h"
+#include "rebble_util.h"
 
 
 static void _connection_service_cb(EventServiceCommand command, void *data, void *context)
diff --git a/rwatch/event/event_service.c b/rwatch/event/event_service.c
index 9a8fbdcd..d1708843 100644
--- a/rwatch/event/event_service.c
+++ b/rwatch/event/event_service.c
@@ -4,7 +4,9 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-#include "rebbleos.h"
+#include <stdint.h>
+#include "main.h"
+#include "rebble_util.h"
 #include "protocol.h"
 #include "pebble_protocol.h"
 #include "overlay_manager.h"
diff --git a/rwatch/graphics/font_loader.c b/rwatch/graphics/font_loader.c
index f051b97d..d2c57741 100644
--- a/rwatch/graphics/font_loader.c
+++ b/rwatch/graphics/font_loader.c
@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "librebble.h"
 #include "platform_res.h"
 
diff --git a/rwatch/ngfxwrap.c b/rwatch/ngfxwrap.c
index ad112bfa..3bb84e1a 100644
--- a/rwatch/ngfxwrap.c
+++ b/rwatch/ngfxwrap.c
@@ -4,7 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "context.h"
 #include "appmanager.h"
 #include "display.h"
diff --git a/rwatch/ui/action_menu.c b/rwatch/ui/action_menu.c
index 158d0561..1b12712d 100644
--- a/rwatch/ui/action_menu.c
+++ b/rwatch/ui/action_menu.c
@@ -7,8 +7,7 @@
  * Author: Carson Katri <me@carsonkatri.com>.
  * Author: Hermann Noll <hermann.noll@hotmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "action_menu.h"
 #include "menu_layer.h"
 #include "pebble_defines.h"
diff --git a/rwatch/ui/animation/animation.c b/rwatch/ui/animation/animation.c
index 02620831..304d5da9 100644
--- a/rwatch/ui/animation/animation.c
+++ b/rwatch/ui/animation/animation.c
@@ -39,6 +39,7 @@
 #include "appmanager.h"
 #include "FreeRTOS.h"
 #include "animation.h"
+#include "rebble_util.h"
 
 /* Configure Logging */
 #define MODULE_NAME "anim"
diff --git a/rwatch/ui/notifications/battery_overlay.c b/rwatch/ui/notifications/battery_overlay.c
index 72a54cd6..b9d9a93b 100644
--- a/rwatch/ui/notifications/battery_overlay.c
+++ b/rwatch/ui/notifications/battery_overlay.c
@@ -1,4 +1,4 @@
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"
 #include "platform_res.h"
diff --git a/rwatch/ui/notifications/call_window.c b/rwatch/ui/notifications/call_window.c
index c02b9f81..4e3b7c93 100644
--- a/rwatch/ui/notifications/call_window.c
+++ b/rwatch/ui/notifications/call_window.c
@@ -4,7 +4,8 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-#include "rebbleos.h"
+#include <stdint.h>
+#include "main.h"
 #include "platform_res.h"
 #include "notification_manager.h"
 #include "protocol.h"
diff --git a/rwatch/ui/notifications/mini_message.c b/rwatch/ui/notifications/mini_message.c
index 98caf679..3c8199ca 100644
--- a/rwatch/ui/notifications/mini_message.c
+++ b/rwatch/ui/notifications/mini_message.c
@@ -1,10 +1,10 @@
+#include "main.h"
 /* mini_message.c
  * Allows a small message to be displayed at the bottom of the screen
  * RebbleOS
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-#include "rebbleos.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"
 #include "platform_res.h"
diff --git a/rwatch/ui/notifications/notification_window.c b/rwatch/ui/notifications/notification_window.c
index d1bc741e..84a1f359 100644
--- a/rwatch/ui/notifications/notification_window.c
+++ b/rwatch/ui/notifications/notification_window.c
@@ -1,4 +1,4 @@
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"
 #include "platform_res.h"
diff --git a/rwatch/ui/notifications/progress_window.c b/rwatch/ui/notifications/progress_window.c
index 9526f2d8..a8ab7271 100644
--- a/rwatch/ui/notifications/progress_window.c
+++ b/rwatch/ui/notifications/progress_window.c
@@ -4,7 +4,8 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-#include "rebbleos.h"
+#include <stdint.h>
+#include "main.h"
 #include "platform_res.h"
 #include "notification_manager.h"
 
diff --git a/rwatch/ui/vibes.c b/rwatch/ui/vibes.c
index 5ea131a9..a4bac72e 100644
--- a/rwatch/ui/vibes.c
+++ b/rwatch/ui/vibes.c
@@ -8,7 +8,6 @@
 #include <stdbool.h>
 #include "vibes.h"
 #include "vibrate.h"
-#include "rebbleos.h"
 
 const static VibratePattern_t short_pattern = {
     .length = 1,