diff --git a/.gitignore b/.gitignore
index 9d75526..9401e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 ChibiOS_*/
 build
-.dep
+.*
diff --git a/Makefile b/Makefile
index 050356d..3fedc91 100644
--- a/Makefile
+++ b/Makefile
@@ -102,33 +102,17 @@ include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32l0xx.m
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/ports/STM32/STM32L0xx/platform.mk
 include $(CHIBIOS)/os/hal/boards/ST_NUCLEO32_L011K4/board.mk
-#include $(CHIBIOS)/os/hal/osal/os-less/ARMCMx/osal.mk
-#include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
-# RTOS files (optional).
-#include $(CHIBIOS)/os/nil/nil.mk
-#include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
 # Auto-build files in ./source recursively.
-#include $(CHIBIOS)/tools/mk/autobuild.mk
-# Other files (optional).
-#include $(CHIBIOS)/test/lib/test.mk
-#include $(CHIBIOS)/test/nil/nil_test.mk
-#include $(CHIBIOS)/test/oslib/oslib_test.mk
+include $(CHIBIOS)/tools/mk/autobuild.mk
 
 # Define linker script file here
-#LDSCRIPT= $(STARTUPLD)/STM32L011x4.ld
 LDSCRIPT= ./STM32L011x4.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CSRC = $(ALLCSRC) \
        $(TESTSRC) \
-	   $(CHIBIOS)/os/hal/osal/lib/osal_vt.c \
-	   2048.c \
-	   buttons.c \
-	   dogs.c \
-	   flapbird.c \
-       main.c \
-	   osal.c
+       $(CHIBIOS)/os/hal/osal/lib/osal_vt.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
diff --git a/openocd.sh b/openocd.sh
index 90d4052..1ce7e72 100755
--- a/openocd.sh
+++ b/openocd.sh
@@ -1 +1 @@
-sudo openocd -f /usr/local/share/openocd/scripts/interface/stlink-v2.cfg -f /usr/local/share/openocd/scripts/target/stm32l0.cfg
+openocd -f /usr/local/share/openocd/scripts/interface/stlink-v2.cfg -f /usr/local/share/openocd/scripts/target/stm32l0.cfg -c "init; program build/ch.hex verify reset exit"
diff --git a/2048.c b/source/2048.c
similarity index 100%
rename from 2048.c
rename to source/2048.c
diff --git a/2048.h b/source/2048.h
similarity index 100%
rename from 2048.h
rename to source/2048.h
diff --git a/buttons.c b/source/buttons.c
similarity index 100%
rename from buttons.c
rename to source/buttons.c
diff --git a/buttons.h b/source/buttons.h
similarity index 100%
rename from buttons.h
rename to source/buttons.h
diff --git a/dogs.c b/source/dogs.c
similarity index 97%
rename from dogs.c
rename to source/dogs.c
index 101339f..b986845 100644
--- a/dogs.c
+++ b/source/dogs.c
@@ -138,11 +138,11 @@ void dogs_init_display()
     dogs_reset();
     CS_HIGH;
 
-	unsigned long int reset_sleep = (STM32_SYSCLK / 1000) * 100;
-	while (reset_sleep != 0) {
-		asm("nop; nop; nop; nop; nop");
-		reset_sleep -= 8;
-	}
+    unsigned long int reset_sleep = (STM32_SYSCLK / 1000) * 100;
+    while (reset_sleep != 0) {
+        asm("nop; nop; nop; nop; nop");
+        reset_sleep -= 8;
+    }
 
     CS_LOW;
     dogs_set_scroll_line(0);
diff --git a/dogs.h b/source/dogs.h
similarity index 100%
rename from dogs.h
rename to source/dogs.h
diff --git a/flapbird.c b/source/flapbird.c
similarity index 100%
rename from flapbird.c
rename to source/flapbird.c
diff --git a/flapbird.h b/source/flapbird.h
similarity index 100%
rename from flapbird.h
rename to source/flapbird.h
diff --git a/main.c b/source/main.c
similarity index 98%
rename from main.c
rename to source/main.c
index 1ef13bf..fd753ea 100644
--- a/main.c
+++ b/source/main.c
@@ -42,9 +42,9 @@ static void alarm_callback(RTCDriver *rtcp, rtcevent_t event)
 
     static bool sleep = false;
 
-	bool sleep_button = (button_state & BUTTON_1) != 0;
+    bool sleep_button = (button_state & BUTTON_1) != 0;
     if (sleep && !sleep_button)
-		return;
+        return;
 
     RCC->ICSCR |= 6 << RCC_ICSCR_MSIRANGE_Pos;
     dogs_set_sleep(false);
diff --git a/osal.c b/source/osal.c
similarity index 100%
rename from osal.c
rename to source/osal.c
diff --git a/osal.h b/source/osal.h
similarity index 100%
rename from osal.h
rename to source/osal.h