8 files changed, 30 insertions, 29 deletions
diff --git a/02-usart/src/clock.c b/02-usart/src/core/clock.c
index 75bac97..d779140 100644
--- a/02-usart/src/clock.c
+++ b/02-usart/src/core/clock.c
@@ -2,10 +2,10 @@
  * This file sets the system clock to its full glory of 80Mhz
  */
 
-#include "clock.h"
+#include "core/clock.h"
+#include "core/flash.h"
+
 #include <stdint.h>
-#include "flash.h"
-#include "gpio.h"
 #include "spin.h"
 
 #define TIMEOUT 10000
diff --git a/02-usart/src/gpio.c b/02-usart/src/core/gpio.c
index 02933b7..c46b1ff 100644
--- a/02-usart/src/gpio.c
+++ b/02-usart/src/core/gpio.c
@@ -1,5 +1,5 @@
-#include "gpio.h"
-#include "rcc.h"
+#include "core/gpio.h"
+#include "core/rcc.h"
 
 /*
  * Sets the mode of a pin on a gpio por.
diff --git a/02-usart/src/init.c b/02-usart/src/core/init.c
index 70703aa..e127006 100644
--- a/02-usart/src/init.c
+++ b/02-usart/src/core/init.c
@@ -1,5 +1,5 @@
 #include "arch.h"
-#include "system.h"
+#include "core/system.h"
 
 /* Forward-declare the main function. This is implemented in main.c. */
 void main();
diff --git a/02-usart/src/isr_vector.c b/02-usart/src/core/isr_vector.c
index 484f3c5..9f3f560 100644
--- a/02-usart/src/isr_vector.c
+++ b/02-usart/src/core/isr_vector.c
@@ -1,8 +1,8 @@
-#include "isr_vector.h"
+#include "core/isr_vector.h"
+#include "core/gpio.h"
 
 #include "arch.h"
 #include "delay.h"
-#include "gpio.h"
 
 #ifdef ARCH_STM32L4
 
@@ -11,7 +11,7 @@
   void WEAK name () { \
     unhandled_isr(n); \
   }
-#include "isrs.i"
+#include "core/isrs.i"
 #undef IRQ_RESERVED
 #undef IRQ
 
@@ -51,7 +51,7 @@ void super_flash()
 #define IRQ(name, n) name,
 const void* vectors[] __attribute__((section(".vectors"))) = {
     (void*)0x2000c000, /* Top of stack at top of sram1. 48k */
-#include "isrs.i"
+#include "core/isrs.i"
 };
 #undef IRQ_RESERVED
 #undef IRQ
diff --git a/02-usart/src/usart.c b/02-usart/src/core/usart.c
index 07bf90c..8f58d8b 100644
--- a/02-usart/src/usart.c
+++ b/02-usart/src/core/usart.c
@@ -1,4 +1,4 @@
-#include "usart.h"
+#include "core/usart.h"
 #include "delay.h"
 #include "lib.h"
 #include <stdarg.h>
diff --git a/02-usart/src/main.c b/02-usart/src/main.c
index b293202..73ccb17 100644
--- a/02-usart/src/main.c
+++ b/02-usart/src/main.c
@@ -1,16 +1,17 @@
 
-#include "isr_vector.h"
-#include "lib.h"
-#include "string.h"
-#include "mem.h"
-#include "dma.h"
 #include "arch.h"
-#include "clock.h"
+#include "core/clock.h"
+#include "core/dma.h"
+#include "core/gpio.h"
+#include "core/isr_vector.h"
+#include "core/system.h"
+#include "core/usart.h"
+
 #include "delay.h"
-#include "gpio.h"
+#include "lib.h"
+#include "mem.h"
 #include "spin.h"
-#include "usart.h"
-#include "system.h"
+#include "string.h"
 
 
 #ifdef ARCH_STM32L4
diff --git a/02-usart/src/mem.c b/02-usart/src/mem.c
index 5772bdc..9fef8bc 100644
--- a/02-usart/src/mem.c
+++ b/02-usart/src/mem.c
@@ -1,11 +1,11 @@
 #include "mem.h"
 #include "common.h"
 
-void memcpy_(void* dest, const void* src, size_t len)
-{
-  uint8_t* dest_ = (uint8_t*) dest;
-  uint8_t* src_ = (uint8_t*) src;
-
-  while ((len--) > 0)
-    *(dest_ ++) = *(src_ ++);
-}
+// void memcpy_(void* dest, const void* src, size_t len)
+// {
+//   uint8_t* dest_ = (uint8_t*) dest;
+//   uint8_t* src_ = (uint8_t*) src;
+// 
+//   while ((len--) > 0)
+//     *(dest_ ++) = *(src_ ++);
+// }
diff --git a/02-usart/src/spin.c b/02-usart/src/spin.c
index fbd16b6..4d1aede 100644
--- a/02-usart/src/spin.c
+++ b/02-usart/src/spin.c
@@ -1,6 +1,6 @@
 #include "spin.h"
 #include "delay.h"
-#include "gpio.h"
+#include "core/gpio.h"
 
 #define SHORT_DELAY 200000
 #define LONG_DELAY (SHORT_DELAY * 2)