diff --git a/hardware/sam/variants/common/UART.cpp b/hardware/sam/cores/sam/UART.cpp
similarity index 100%
rename from hardware/sam/variants/common/UART.cpp
rename to hardware/sam/cores/sam/UART.cpp
diff --git a/hardware/sam/variants/common/UART.h b/hardware/sam/cores/sam/UART.h
similarity index 100%
rename from hardware/sam/variants/common/UART.h
rename to hardware/sam/cores/sam/UART.h
diff --git a/hardware/sam/variants/common/USART.cpp b/hardware/sam/cores/sam/USART.cpp
similarity index 100%
rename from hardware/sam/variants/common/USART.cpp
rename to hardware/sam/cores/sam/USART.cpp
diff --git a/hardware/sam/variants/common/USART.h b/hardware/sam/cores/sam/USART.h
similarity index 100%
rename from hardware/sam/variants/common/USART.h
rename to hardware/sam/cores/sam/USART.h
diff --git a/hardware/sam/cores/sam/USB_driver.cpp b/hardware/sam/cores/sam/USB_driver.cpp
new file mode 100644
index 000000000..765eb7e30
--- /dev/null
+++ b/hardware/sam/cores/sam/USB_driver.cpp
@@ -0,0 +1,4 @@
+
+#include "Arduino.h"
+#include "USB_driver.h"
+
diff --git a/hardware/sam/cores/sam/USB_driver.h b/hardware/sam/cores/sam/USB_driver.h
new file mode 100644
index 000000000..d2bcacbc3
--- /dev/null
+++ b/hardware/sam/cores/sam/USB_driver.h
@@ -0,0 +1,4 @@
+#ifndef _USB_DRIVER_
+#define _USB_DRIVER_
+
+#endif /* _USB_DRIVER_*/
diff --git a/hardware/sam/variants/common/cortex_handlers.cpp b/hardware/sam/cores/sam/cortex_handlers.cpp
similarity index 100%
rename from hardware/sam/variants/common/cortex_handlers.cpp
rename to hardware/sam/cores/sam/cortex_handlers.cpp