diff --git a/ports/bdk-atxx4-mstp/Makefile b/ports/bdk-atxx4-mstp/Makefile
index 75856307..0f948668 100644
--- a/ports/bdk-atxx4-mstp/Makefile
+++ b/ports/bdk-atxx4-mstp/Makefile
@@ -402,7 +402,7 @@ showfuses:
 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_READ_FUSES)
 
 bootloader:
-	make -C bootloader all
+	make -C external/bootloader all
 
 ## Clean target
 .PHONY: clean
diff --git a/ports/bdk-atxx4-mstp/bacnet.hzp b/ports/bdk-atxx4-mstp/bacnet.hzp
index d5a2f033..bb42cf53 100644
--- a/ports/bdk-atxx4-mstp/bacnet.hzp
+++ b/ports/bdk-atxx4-mstp/bacnet.hzp
@@ -1,7 +1,7 @@
 <!DOCTYPE CrossStudio_Project_File>
 <solution Name="bacnet" version="2">
   <project Name="bacnet">
-    <configuration Name="Common" Platform="AVR" Target="ATmega644P" avr_architecture="V2E" avr_debug_interface="JTAG" avr_flash_size="128K" build_use_hardware_multiplier="Yes" c_preprocessor_definitions="BACDL_MSTP;MAX_APDU=128;MAX_TSM_TRANSACTIONS=0;MAX_CHARACTER_STRING_BYTES=64;MAX_OCTET_STRING_BYTES=64;BACAPP_BOOLEAN;BACAPP_REAL;BACAPP_OBJECT_ID;BACAPP_UNSIGNED;BACAPP_ENUMERATED;BACAPP_CHARACTER_STRING;BACAPP_OCTET_STRING;WRITE_PROPERTY" c_user_include_directories="$(ProjectDir);$(ProjectDir)/crossworks;$(ProjectDir)/../../include;$(ProjectDir)/../../src" linker_call_stack_size="1024" linker_memory_map_file="$(PackagesDir)/targets/avr/ATmega644P.xml" project_directory="" project_type="Executable"/>
+    <configuration Name="Common" Platform="AVR" Target="ATmega644P" avr_architecture="V2E" avr_debug_interface="JTAG" avr_flash_size="128K" build_use_hardware_multiplier="Yes" c_preprocessor_definitions="BACDL_MSTP;MAX_APDU=128;MAX_TSM_TRANSACTIONS=0;MAX_CHARACTER_STRING_BYTES=64;MAX_OCTET_STRING_BYTES=64;BACAPP_BOOLEAN;BACAPP_REAL;BACAPP_OBJECT_ID;BACAPP_UNSIGNED;BACAPP_ENUMERATED;BACAPP_CHARACTER_STRING;BACAPP_OCTET_STRING;WRITE_PROPERTY" c_user_include_directories="$(ProjectDir);$(ProjectDir)/external/crossworks;$(ProjectDir)/../../include;$(ProjectDir)/../../src" linker_call_stack_size="1024" linker_memory_map_file="$(PackagesDir)/targets/avr/ATmega644P.xml" project_directory="" project_type="Executable"/>
     <folder Name="Source Files">
       <configuration Name="Common" filter="c;h;s;asm;inc;s90"/>
       <file file_name="adc.c">
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRBootloader.cpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRBootloader.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRBootloader.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRBootloader.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRBootloader.hpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRBootloader.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRBootloader.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRBootloader.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRDevice.cpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRDevice.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRDevice.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRDevice.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRDevice.hpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRDevice.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRDevice.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRDevice.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRInSystemProg.cpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRInSystemProg.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRInSystemProg.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRInSystemProg.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRInSystemProg.hpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRInSystemProg.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRInSystemProg.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRInSystemProg.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVROSP.dev b/ports/bdk-atxx4-mstp/external/avrosp/AVROSP.dev
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVROSP.dev
rename to ports/bdk-atxx4-mstp/external/avrosp/AVROSP.dev
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRProgrammer.cpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRProgrammer.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRProgrammer.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRProgrammer.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/AVRProgrammer.hpp b/ports/bdk-atxx4-mstp/external/avrosp/AVRProgrammer.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/AVRProgrammer.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/AVRProgrammer.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/CommChannel.cpp b/ports/bdk-atxx4-mstp/external/avrosp/CommChannel.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/CommChannel.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/CommChannel.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/CommChannel.hpp b/ports/bdk-atxx4-mstp/external/avrosp/CommChannel.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/CommChannel.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/CommChannel.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/ErrorMsg.cpp b/ports/bdk-atxx4-mstp/external/avrosp/ErrorMsg.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/ErrorMsg.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/ErrorMsg.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/ErrorMsg.hpp b/ports/bdk-atxx4-mstp/external/avrosp/ErrorMsg.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/ErrorMsg.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/ErrorMsg.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/HEXParser.cpp b/ports/bdk-atxx4-mstp/external/avrosp/HEXParser.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/HEXParser.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/HEXParser.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/HEXParser.hpp b/ports/bdk-atxx4-mstp/external/avrosp/HEXParser.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/HEXParser.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/HEXParser.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/JobInfo.cpp b/ports/bdk-atxx4-mstp/external/avrosp/JobInfo.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/JobInfo.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/JobInfo.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/JobInfo.hpp b/ports/bdk-atxx4-mstp/external/avrosp/JobInfo.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/JobInfo.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/JobInfo.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/SerialPort.cpp b/ports/bdk-atxx4-mstp/external/avrosp/SerialPort.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/SerialPort.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/SerialPort.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/SerialPort.hpp b/ports/bdk-atxx4-mstp/external/avrosp/SerialPort.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/SerialPort.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/SerialPort.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/Utility.cpp b/ports/bdk-atxx4-mstp/external/avrosp/Utility.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/Utility.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/Utility.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/Utility.hpp b/ports/bdk-atxx4-mstp/external/avrosp/Utility.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/Utility.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/Utility.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/XMLParser.cpp b/ports/bdk-atxx4-mstp/external/avrosp/XMLParser.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/XMLParser.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/XMLParser.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/XMLParser.hpp b/ports/bdk-atxx4-mstp/external/avrosp/XMLParser.hpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/XMLParser.hpp
rename to ports/bdk-atxx4-mstp/external/avrosp/XMLParser.hpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/main.cpp b/ports/bdk-atxx4-mstp/external/avrosp/main.cpp
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/main.cpp
rename to ports/bdk-atxx4-mstp/external/avrosp/main.cpp
diff --git a/ports/bdk-atxx4-mstp/avrosp/readme.txt b/ports/bdk-atxx4-mstp/external/avrosp/readme.txt
similarity index 100%
rename from ports/bdk-atxx4-mstp/avrosp/readme.txt
rename to ports/bdk-atxx4-mstp/external/avrosp/readme.txt
diff --git a/ports/bdk-atxx4-mstp/bootloader/Makefile b/ports/bdk-atxx4-mstp/external/bootloader/Makefile
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/Makefile
rename to ports/bdk-atxx4-mstp/external/bootloader/Makefile
diff --git a/ports/bdk-atxx4-mstp/bootloader/bootloader.aps b/ports/bdk-atxx4-mstp/external/bootloader/bootloader.aps
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/bootloader.aps
rename to ports/bdk-atxx4-mstp/external/bootloader/bootloader.aps
diff --git a/ports/bdk-atxx4-mstp/bootloader/defines.h b/ports/bdk-atxx4-mstp/external/bootloader/defines.h
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/defines.h
rename to ports/bdk-atxx4-mstp/external/bootloader/defines.h
diff --git a/ports/bdk-atxx4-mstp/bootloader/flash.h b/ports/bdk-atxx4-mstp/external/bootloader/flash.h
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/flash.h
rename to ports/bdk-atxx4-mstp/external/bootloader/flash.h
diff --git a/ports/bdk-atxx4-mstp/bootloader/main.c b/ports/bdk-atxx4-mstp/external/bootloader/main.c
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/main.c
rename to ports/bdk-atxx4-mstp/external/bootloader/main.c
diff --git a/ports/bdk-atxx4-mstp/bootloader/parts.txt b/ports/bdk-atxx4-mstp/external/bootloader/parts.txt
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/parts.txt
rename to ports/bdk-atxx4-mstp/external/bootloader/parts.txt
diff --git a/ports/bdk-atxx4-mstp/bootloader/preprocessor.sh b/ports/bdk-atxx4-mstp/external/bootloader/preprocessor.sh
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/preprocessor.sh
rename to ports/bdk-atxx4-mstp/external/bootloader/preprocessor.sh
diff --git a/ports/bdk-atxx4-mstp/bootloader/preprocessor.xls b/ports/bdk-atxx4-mstp/external/bootloader/preprocessor.xls
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/preprocessor.xls
rename to ports/bdk-atxx4-mstp/external/bootloader/preprocessor.xls
diff --git a/ports/bdk-atxx4-mstp/bootloader/serial.c b/ports/bdk-atxx4-mstp/external/bootloader/serial.c
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/serial.c
rename to ports/bdk-atxx4-mstp/external/bootloader/serial.c
diff --git a/ports/bdk-atxx4-mstp/bootloader/serial.h b/ports/bdk-atxx4-mstp/external/bootloader/serial.h
similarity index 100%
rename from ports/bdk-atxx4-mstp/bootloader/serial.h
rename to ports/bdk-atxx4-mstp/external/bootloader/serial.h
diff --git a/ports/bdk-atxx4-mstp/crossworks/stdbool.h b/ports/bdk-atxx4-mstp/external/crossworks/stdbool.h
similarity index 100%
rename from ports/bdk-atxx4-mstp/crossworks/stdbool.h
rename to ports/bdk-atxx4-mstp/external/crossworks/stdbool.h
diff --git a/ports/stm32f10x/CMakeLists.txt b/ports/stm32f10x/CMakeLists.txt
index 0db63e54..29512a26 100644
--- a/ports/stm32f10x/CMakeLists.txt
+++ b/ports/stm32f10x/CMakeLists.txt
@@ -99,10 +99,10 @@ endif()
 set(LIBRARY_BACNET_INC "${CMAKE_SOURCE_DIR}/../../src")
 set(LIBRARY_BACNET_CORE "${CMAKE_SOURCE_DIR}/../../src/bacnet")
 set(LIBRARY_BACNET_BASIC "${CMAKE_SOURCE_DIR}/../../src/bacnet/basic")
-set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/drivers/src")
-set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/drivers/inc")
-set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/CMSIS")
-set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/CMSIS/gcc_ride7")
+set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/external/drivers/src")
+set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/external/drivers/inc")
+set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/external/CMSIS")
+set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/external/CMSIS/gcc_ride7")
 
 set(BACNET_PROJECT_SOURCE
     ${LIBRARY_STM32_SRC}/stm32f10x_adc.c
@@ -205,7 +205,7 @@ set(BACNET_PROJECT_SOURCE
     ${LIBRARY_BACNET_CORE}/wp.c
 
     ${LIBRARY_CMSIS_GCC_INC}/startup_stm32f10x_xl.s
-    CMSIS/stm32f10x.h
+    ${LIBRARY_CMSIS_INC}/stm32f10x.h
 )
 
 set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/stm32f10x.ld)
diff --git a/ports/stm32f10x/Makefile b/ports/stm32f10x/Makefile
index 05e048c2..897e645e 100644
--- a/ports/stm32f10x/Makefile
+++ b/ports/stm32f10x/Makefile
@@ -9,9 +9,9 @@ BACNET_CORE := $(BACNET_SRC)/bacnet
 BACNET_BASIC := $(BACNET_CORE)/basic
 BACNET_INCLUDE := $(BACNET_SRC)
 PLATFORM_DIR = .
-LIBRARY_STM32 = ./drivers/src
-LIBRARY_STM32_INCLUDES = ./drivers/inc
-LIBRARY_CMSIS = ./CMSIS
+LIBRARY_STM32 = ./external/drivers/src
+LIBRARY_STM32_INCLUDES = ./external/drivers/inc
+LIBRARY_CMSIS = ./external/CMSIS
 
 CSTACK_TOOL := $(BACNET_DIR)/tools/avstack/avstack.pl
 MEMAP_TOOL := $(BACNET_DIR)/tools/memap/memap.py
diff --git a/ports/stm32f10x/bacnet.ewp b/ports/stm32f10x/bacnet.ewp
index 2f5f5640..ec3d0a8b 100644
--- a/ports/stm32f10x/bacnet.ewp
+++ b/ports/stm32f10x/bacnet.ewp
@@ -356,8 +356,8 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
                     <state>$PROJ_DIR$\..\..\src</state>
-                    <state>$PROJ_DIR$\CMSIS\</state>
-                    <state>$PROJ_DIR$\drivers\inc</state>
+                    <state>$PROJ_DIR$\external\CMSIS\</state>
+                    <state>$PROJ_DIR$\external\drivers\inc</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -1212,79 +1212,79 @@
     <group>
         <name>CMSIS</name>
         <file>
-            <name>$PROJ_DIR$\CMSIS\iar\startup_stm32f10x_xl.s</name>
+            <name>$PROJ_DIR$\external\CMSIS\iar\startup_stm32f10x_xl.s</name>
         </file>
     </group>
     <group>
         <name>STM32-Lib</name>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_adc.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_adc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_bkp.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_bkp.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_can.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_can.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_cec.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_cec.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_crc.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_crc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_dac.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_dac.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_dbgmcu.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_dbgmcu.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_dma.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_dma.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_exti.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_exti.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_flash.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_flash.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_fsmc.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_fsmc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_gpio.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_gpio.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_i2c.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_i2c.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_iwdg.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_iwdg.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_misc.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_misc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_pwr.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_pwr.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_rcc.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_rcc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_rtc.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_rtc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_sdio.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_sdio.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_spi.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_spi.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_tim.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_tim.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_usart.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_usart.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\drivers\src\stm32f10x_wwdg.c</name>
+            <name>$PROJ_DIR$\external\drivers\src\stm32f10x_wwdg.c</name>
         </file>
     </group>
     <file>
diff --git a/ports/stm32f10x/CMSIS/CMSIS debug support.htm b/ports/stm32f10x/external/CMSIS/CMSIS debug support.htm
similarity index 100%
rename from ports/stm32f10x/CMSIS/CMSIS debug support.htm
rename to ports/stm32f10x/external/CMSIS/CMSIS debug support.htm
diff --git a/ports/stm32f10x/CMSIS/CMSIS_Core.htm b/ports/stm32f10x/external/CMSIS/CMSIS_Core.htm
similarity index 100%
rename from ports/stm32f10x/CMSIS/CMSIS_Core.htm
rename to ports/stm32f10x/external/CMSIS/CMSIS_Core.htm
diff --git a/ports/stm32f10x/CMSIS/CMSIS_changes.htm b/ports/stm32f10x/external/CMSIS/CMSIS_changes.htm
similarity index 100%
rename from ports/stm32f10x/CMSIS/CMSIS_changes.htm
rename to ports/stm32f10x/external/CMSIS/CMSIS_changes.htm
diff --git a/ports/stm32f10x/CMSIS/License.doc b/ports/stm32f10x/external/CMSIS/License.doc
similarity index 100%
rename from ports/stm32f10x/CMSIS/License.doc
rename to ports/stm32f10x/external/CMSIS/License.doc
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_cl.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_cl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_cl.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_cl.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_hd.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_hd.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_hd.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_hd.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_hd_vl.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_hd_vl.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_hd_vl.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_ld.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_ld.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_ld.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_ld.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_ld_vl.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_ld_vl.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_ld_vl.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_md.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_md.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_md.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_md.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_md_vl.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_md_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_md_vl.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_md_vl.s
diff --git a/ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_xl.s b/ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_xl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/TrueSTUDIO/startup_stm32f10x_xl.s
rename to ports/stm32f10x/external/CMSIS/TrueSTUDIO/startup_stm32f10x_xl.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_cl.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_cl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_cl.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_cl.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_hd.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_hd.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_hd.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_hd.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_hd_vl.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_hd_vl.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_hd_vl.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_ld.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_ld.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_ld.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_ld.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_ld_vl.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_ld_vl.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_ld_vl.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_md.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_md.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_md.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_md.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_md_vl.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_md_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_md_vl.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_md_vl.s
diff --git a/ports/stm32f10x/CMSIS/arm/startup_stm32f10x_xl.s b/ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_xl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/arm/startup_stm32f10x_xl.s
rename to ports/stm32f10x/external/CMSIS/arm/startup_stm32f10x_xl.s
diff --git a/ports/stm32f10x/CMSIS/core_cm3.c b/ports/stm32f10x/external/CMSIS/core_cm3.c
similarity index 100%
rename from ports/stm32f10x/CMSIS/core_cm3.c
rename to ports/stm32f10x/external/CMSIS/core_cm3.c
diff --git a/ports/stm32f10x/CMSIS/core_cm3.h b/ports/stm32f10x/external/CMSIS/core_cm3.h
similarity index 100%
rename from ports/stm32f10x/CMSIS/core_cm3.h
rename to ports/stm32f10x/external/CMSIS/core_cm3.h
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_cl.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_cl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_cl.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_cl.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_hd.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_hd.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_hd.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_hd.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_hd_vl.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_hd_vl.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_hd_vl.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_ld.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_ld.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_ld.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_ld.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_ld_vl.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_ld_vl.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_ld_vl.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_md.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_md.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_md.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_md.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_md_vl.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_md_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_md_vl.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_md_vl.s
diff --git a/ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_xl.s b/ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_xl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/gcc_ride7/startup_stm32f10x_xl.s
rename to ports/stm32f10x/external/CMSIS/gcc_ride7/startup_stm32f10x_xl.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_cl.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_cl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_cl.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_cl.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_hd.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_hd.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_hd.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_hd.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_hd_vl.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_hd_vl.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_hd_vl.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_ld.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_ld.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_ld.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_ld.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_ld_vl.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_ld_vl.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_ld_vl.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_md.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_md.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_md.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_md.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_md_vl.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_md_vl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_md_vl.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_md_vl.s
diff --git a/ports/stm32f10x/CMSIS/iar/startup_stm32f10x_xl.s b/ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_xl.s
similarity index 100%
rename from ports/stm32f10x/CMSIS/iar/startup_stm32f10x_xl.s
rename to ports/stm32f10x/external/CMSIS/iar/startup_stm32f10x_xl.s
diff --git a/ports/stm32f10x/CMSIS/stm32f10x.h b/ports/stm32f10x/external/CMSIS/stm32f10x.h
similarity index 100%
rename from ports/stm32f10x/CMSIS/stm32f10x.h
rename to ports/stm32f10x/external/CMSIS/stm32f10x.h
diff --git a/ports/stm32f10x/CMSIS/system_stm32f10x.h b/ports/stm32f10x/external/CMSIS/system_stm32f10x.h
similarity index 100%
rename from ports/stm32f10x/CMSIS/system_stm32f10x.h
rename to ports/stm32f10x/external/CMSIS/system_stm32f10x.h
diff --git a/ports/stm32f10x/drivers/Release_Notes_for_STM32F10x_StdPeriph_Driver.html b/ports/stm32f10x/external/drivers/Release_Notes_for_STM32F10x_StdPeriph_Driver.html
similarity index 100%
rename from ports/stm32f10x/drivers/Release_Notes_for_STM32F10x_StdPeriph_Driver.html
rename to ports/stm32f10x/external/drivers/Release_Notes_for_STM32F10x_StdPeriph_Driver.html
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_adc.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_adc.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_adc.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_adc.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_bkp.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_bkp.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_bkp.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_bkp.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_can.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_can.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_can.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_can.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_cec.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_cec.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_cec.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_cec.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_crc.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_crc.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_crc.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_crc.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_dac.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_dac.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_dac.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_dac.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_dbgmcu.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_dbgmcu.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_dbgmcu.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_dbgmcu.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_dma.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_dma.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_dma.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_dma.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_exti.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_exti.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_exti.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_exti.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_flash.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_flash.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_flash.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_flash.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_fsmc.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_fsmc.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_fsmc.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_fsmc.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_gpio.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_gpio.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_gpio.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_gpio.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_i2c.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_i2c.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_i2c.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_i2c.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_iwdg.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_iwdg.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_iwdg.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_iwdg.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_misc.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_misc.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_misc.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_misc.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_pwr.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_pwr.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_pwr.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_pwr.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_rcc.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_rcc.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_rcc.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_rcc.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_rtc.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_rtc.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_rtc.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_rtc.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_sdio.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_sdio.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_sdio.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_sdio.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_spi.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_spi.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_spi.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_spi.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_tim.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_tim.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_tim.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_tim.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_usart.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_usart.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_usart.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_usart.h
diff --git a/ports/stm32f10x/drivers/inc/stm32f10x_wwdg.h b/ports/stm32f10x/external/drivers/inc/stm32f10x_wwdg.h
similarity index 100%
rename from ports/stm32f10x/drivers/inc/stm32f10x_wwdg.h
rename to ports/stm32f10x/external/drivers/inc/stm32f10x_wwdg.h
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_adc.c b/ports/stm32f10x/external/drivers/src/stm32f10x_adc.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_adc.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_adc.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_bkp.c b/ports/stm32f10x/external/drivers/src/stm32f10x_bkp.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_bkp.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_bkp.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_can.c b/ports/stm32f10x/external/drivers/src/stm32f10x_can.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_can.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_can.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_cec.c b/ports/stm32f10x/external/drivers/src/stm32f10x_cec.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_cec.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_cec.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_crc.c b/ports/stm32f10x/external/drivers/src/stm32f10x_crc.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_crc.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_crc.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_dac.c b/ports/stm32f10x/external/drivers/src/stm32f10x_dac.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_dac.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_dac.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_dbgmcu.c b/ports/stm32f10x/external/drivers/src/stm32f10x_dbgmcu.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_dbgmcu.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_dbgmcu.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_dma.c b/ports/stm32f10x/external/drivers/src/stm32f10x_dma.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_dma.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_dma.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_exti.c b/ports/stm32f10x/external/drivers/src/stm32f10x_exti.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_exti.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_exti.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_flash.c b/ports/stm32f10x/external/drivers/src/stm32f10x_flash.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_flash.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_flash.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_fsmc.c b/ports/stm32f10x/external/drivers/src/stm32f10x_fsmc.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_fsmc.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_fsmc.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_gpio.c b/ports/stm32f10x/external/drivers/src/stm32f10x_gpio.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_gpio.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_gpio.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_i2c.c b/ports/stm32f10x/external/drivers/src/stm32f10x_i2c.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_i2c.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_i2c.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_iwdg.c b/ports/stm32f10x/external/drivers/src/stm32f10x_iwdg.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_iwdg.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_iwdg.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_misc.c b/ports/stm32f10x/external/drivers/src/stm32f10x_misc.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_misc.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_misc.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_pwr.c b/ports/stm32f10x/external/drivers/src/stm32f10x_pwr.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_pwr.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_pwr.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_rcc.c b/ports/stm32f10x/external/drivers/src/stm32f10x_rcc.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_rcc.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_rcc.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_rtc.c b/ports/stm32f10x/external/drivers/src/stm32f10x_rtc.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_rtc.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_rtc.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_sdio.c b/ports/stm32f10x/external/drivers/src/stm32f10x_sdio.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_sdio.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_sdio.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_spi.c b/ports/stm32f10x/external/drivers/src/stm32f10x_spi.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_spi.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_spi.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_tim.c b/ports/stm32f10x/external/drivers/src/stm32f10x_tim.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_tim.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_tim.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_usart.c b/ports/stm32f10x/external/drivers/src/stm32f10x_usart.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_usart.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_usart.c
diff --git a/ports/stm32f10x/drivers/src/stm32f10x_wwdg.c b/ports/stm32f10x/external/drivers/src/stm32f10x_wwdg.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/stm32f10x_wwdg.c
rename to ports/stm32f10x/external/drivers/src/stm32f10x_wwdg.c
diff --git a/ports/stm32f10x/drivers/src/syscalls.c b/ports/stm32f10x/external/drivers/src/syscalls.c
similarity index 100%
rename from ports/stm32f10x/drivers/src/syscalls.c
rename to ports/stm32f10x/external/drivers/src/syscalls.c
diff --git a/ports/stm32f4xx/CMakeLists.txt b/ports/stm32f4xx/CMakeLists.txt
index 91debb07..8c88dff7 100644
--- a/ports/stm32f4xx/CMakeLists.txt
+++ b/ports/stm32f4xx/CMakeLists.txt
@@ -103,10 +103,10 @@ endif()
 set(LIBRARY_BACNET_INC "${CMAKE_SOURCE_DIR}/../../src")
 set(LIBRARY_BACNET_CORE "${CMAKE_SOURCE_DIR}/../../src/bacnet")
 set(LIBRARY_BACNET_BASIC "${CMAKE_SOURCE_DIR}/../../src/bacnet/basic")
-set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/STM32F4xx_StdPeriph_Driver/src")
-set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/STM32F4xx_StdPeriph_Driver/inc")
-set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/CMSIS")
-set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/CMSIS/gcc_ride7")
+set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/external/STM32F4xx_StdPeriph_Driver/src")
+set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/external/STM32F4xx_StdPeriph_Driver/inc")
+set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/external/CMSIS")
+set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/external/CMSIS/gcc_ride7")
 
 set(BACNET_PROJECT_SOURCE
     ${LIBRARY_STM32_SRC}/stm32f4xx_adc.c
@@ -220,8 +220,8 @@ set(BACNET_PROJECT_SOURCE
     ${LIBRARY_BACNET_CORE}/whois.c
     ${LIBRARY_BACNET_CORE}/wp.c
 
-    CMSIS/gcc_ride7/startup_stm32f4xx.s
-    CMSIS/stm32f4xx.h
+    ${LIBRARY_CMSIS_GCC_INC}/startup_stm32f4xx.s
+    ${LIBRARY_CMSIS_INC}/stm32f4xx.h
 )
 
 set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/stm32f4xx.ld)
diff --git a/ports/stm32f4xx/Makefile b/ports/stm32f4xx/Makefile
index 63b006d0..c125bf3d 100644
--- a/ports/stm32f4xx/Makefile
+++ b/ports/stm32f4xx/Makefile
@@ -9,9 +9,9 @@ BACNET_CORE := $(BACNET_SRC)/bacnet
 BACNET_BASIC := $(BACNET_CORE)/basic
 BACNET_INCLUDE := $(BACNET_SRC)
 PLATFORM_DIR = .
-LIBRARY_STM32 = ./STM32F4xx_StdPeriph_Driver/src
-LIBRARY_STM32_INCLUDES = ./STM32F4xx_StdPeriph_Driver/inc
-LIBRARY_CMSIS = ./CMSIS
+LIBRARY_STM32 = ./external/STM32F4xx_StdPeriph_Driver/src
+LIBRARY_STM32_INCLUDES = ./external/STM32F4xx_StdPeriph_Driver/inc
+LIBRARY_CMSIS = ./external/CMSIS
 
 CSTACK_TOOL := $(BACNET_DIR)/tools/avstack/avstack.pl
 MEMAP_TOOL := $(BACNET_DIR)/tools/memap/memap.py
diff --git a/ports/stm32f4xx/bacnet.ewp b/ports/stm32f4xx/bacnet.ewp
index e80d1e1c..9426774a 100644
--- a/ports/stm32f4xx/bacnet.ewp
+++ b/ports/stm32f4xx/bacnet.ewp
@@ -353,9 +353,9 @@
                 <option>
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$</state>
-                    <state>$PROJ_DIR$\CMSIS</state>
-                    <state>$PROJ_DIR$\CMSIS\iar</state>
-                    <state>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\inc</state>
+                    <state>$PROJ_DIR$\external\CMSIS</state>
+                    <state>$PROJ_DIR$\external\CMSIS\iar</state>
+                    <state>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\inc</state>
                     <state>$PROJ_DIR$\..\..\src</state>
                 </option>
                 <option>
@@ -1293,40 +1293,40 @@
     <group>
         <name>STM32F4-STARTUP</name>
         <file>
-            <name>$PROJ_DIR$\CMSIS\iar\startup_stm32f4xx.s</name>
+            <name>$PROJ_DIR$\external\CMSIS\iar\startup_stm32f4xx.s</name>
         </file>
     </group>
     <group>
         <name>STM32F4XX_LIB</name>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_adc.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_adc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_flash.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_flash.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_gpio.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_gpio.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_i2c.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_i2c.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_iwdg.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_iwdg.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_misc.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_misc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_pwr.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_pwr.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_rcc.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_rcc.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_tim.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_tim.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_usart.c</name>
+            <name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_usart.c</name>
         </file>
     </group>
     <file>
diff --git a/ports/stm32f4xx/CMSIS/TrueSTUDIO/startup_stm32f4xx.s b/ports/stm32f4xx/external/CMSIS/TrueSTUDIO/startup_stm32f4xx.s
similarity index 100%
rename from ports/stm32f4xx/CMSIS/TrueSTUDIO/startup_stm32f4xx.s
rename to ports/stm32f4xx/external/CMSIS/TrueSTUDIO/startup_stm32f4xx.s
diff --git a/ports/stm32f4xx/CMSIS/arm/startup_stm32f4xx.s b/ports/stm32f4xx/external/CMSIS/arm/startup_stm32f4xx.s
similarity index 100%
rename from ports/stm32f4xx/CMSIS/arm/startup_stm32f4xx.s
rename to ports/stm32f4xx/external/CMSIS/arm/startup_stm32f4xx.s
diff --git a/ports/stm32f4xx/CMSIS/arm_common_tables.h b/ports/stm32f4xx/external/CMSIS/arm_common_tables.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/arm_common_tables.h
rename to ports/stm32f4xx/external/CMSIS/arm_common_tables.h
diff --git a/ports/stm32f4xx/CMSIS/arm_math.h b/ports/stm32f4xx/external/CMSIS/arm_math.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/arm_math.h
rename to ports/stm32f4xx/external/CMSIS/arm_math.h
diff --git a/ports/stm32f4xx/CMSIS/core_cm0.h b/ports/stm32f4xx/external/CMSIS/core_cm0.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/core_cm0.h
rename to ports/stm32f4xx/external/CMSIS/core_cm0.h
diff --git a/ports/stm32f4xx/CMSIS/core_cm3.h b/ports/stm32f4xx/external/CMSIS/core_cm3.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/core_cm3.h
rename to ports/stm32f4xx/external/CMSIS/core_cm3.h
diff --git a/ports/stm32f4xx/CMSIS/core_cm4.h b/ports/stm32f4xx/external/CMSIS/core_cm4.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/core_cm4.h
rename to ports/stm32f4xx/external/CMSIS/core_cm4.h
diff --git a/ports/stm32f4xx/CMSIS/core_cm4_simd.h b/ports/stm32f4xx/external/CMSIS/core_cm4_simd.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/core_cm4_simd.h
rename to ports/stm32f4xx/external/CMSIS/core_cm4_simd.h
diff --git a/ports/stm32f4xx/CMSIS/core_cmFunc.h b/ports/stm32f4xx/external/CMSIS/core_cmFunc.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/core_cmFunc.h
rename to ports/stm32f4xx/external/CMSIS/core_cmFunc.h
diff --git a/ports/stm32f4xx/CMSIS/core_cmInstr.h b/ports/stm32f4xx/external/CMSIS/core_cmInstr.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/core_cmInstr.h
rename to ports/stm32f4xx/external/CMSIS/core_cmInstr.h
diff --git a/ports/stm32f4xx/CMSIS/gcc_ride7/startup_stm32f4xx.s b/ports/stm32f4xx/external/CMSIS/gcc_ride7/startup_stm32f4xx.s
similarity index 100%
rename from ports/stm32f4xx/CMSIS/gcc_ride7/startup_stm32f4xx.s
rename to ports/stm32f4xx/external/CMSIS/gcc_ride7/startup_stm32f4xx.s
diff --git a/ports/stm32f4xx/CMSIS/iar/startup_stm32f4xx.s b/ports/stm32f4xx/external/CMSIS/iar/startup_stm32f4xx.s
similarity index 100%
rename from ports/stm32f4xx/CMSIS/iar/startup_stm32f4xx.s
rename to ports/stm32f4xx/external/CMSIS/iar/startup_stm32f4xx.s
diff --git a/ports/stm32f4xx/CMSIS/stm32f4xx.h b/ports/stm32f4xx/external/CMSIS/stm32f4xx.h
similarity index 100%
rename from ports/stm32f4xx/CMSIS/stm32f4xx.h
rename to ports/stm32f4xx/external/CMSIS/stm32f4xx.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/Release_Notes.html b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/Release_Notes.html
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/Release_Notes.html
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/Release_Notes.html
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_adc.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_can.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_crc.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_cryp.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dac.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dbgmcu.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dcmi.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_dma.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_exti.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_flash.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_fsmc.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_gpio.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_hash.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_iwdg.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_misc.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_misc.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_misc.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_misc.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_pwr.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rcc.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rng.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_rtc.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_sdio.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_spi.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_syscfg.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_tim.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_usart.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_wwdg.h
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_adc.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_can.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_crc.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_aes.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_des.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_cryp_tdes.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dac.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dcmi.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_flash.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_fsmc.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_md5.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_hash_sha1.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_i2c.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_iwdg.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_misc.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_misc.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_misc.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_misc.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_pwr.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rng.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rtc.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_sdio.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_wwdg.c
diff --git a/ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/syscalls.c b/ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/syscalls.c
similarity index 100%
rename from ports/stm32f4xx/STM32F4xx_StdPeriph_Driver/src/syscalls.c
rename to ports/stm32f4xx/external/STM32F4xx_StdPeriph_Driver/src/syscalls.c
diff --git a/ports/xplained/Makefile b/ports/xplained/Makefile
index d844251c..86391c83 100644
--- a/ports/xplained/Makefile
+++ b/ports/xplained/Makefile
@@ -33,7 +33,7 @@ STRIP = $(PREFIX)strip
 SIZE = $(PREFIX)size
 
 # Source locations
-SDK_DIR = ASF
+SDK_DIR = external/ASF
 BACNET_DIR = ../../src
 BACNET_CORE = $(BACNET_DIR)/bacnet
 BACNET_BASIC = $(BACNET_CORE)/basic
@@ -161,7 +161,7 @@ SDK_INCLUDES += -I$(SDK_DIR)/common/services/serial
 SDK_INCLUDES += -I$(SDK_DIR)/common/utils/stdio/stdio_serial
 SDK_INCLUDES += -I$(SDK_DIR)/xmega/services/timeout
 
-INCLUDES = -I. -I./config -I$(BACNET_DIR) $(SDK_INCLUDES)
+INCLUDES = -I. -I./external/config -I$(BACNET_DIR) $(SDK_INCLUDES)
 
 # Source to Object conversion
 COBJ = $(CSRC:.c=.o)
diff --git a/ports/xplained/bacnet.cproj b/ports/xplained/bacnet.cproj
index 9f08d67d..29bf21cc 100644
--- a/ports/xplained/bacnet.cproj
+++ b/ports/xplained/bacnet.cproj
@@ -54,38 +54,38 @@
     <configuration key="config.xmega.drivers.usb.device.sleepmgr" value="with_sleepmgr" default="with_sleepmgr" content-id="Atmel.ASF" />
   </configurations>
   <files>
-    <file path="ASF/common/boards/board.h" framework="" version="" source="common/boards/board.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/genclk.h" framework="" version="" source="common/services/clock/genclk.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/osc.h" framework="" version="" source="common/services/clock/osc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/pll.h" framework="" version="" source="common/services/clock/pll.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/sysclk.h" framework="" version="" source="common/services/clock/sysclk.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/xmega/osc.h" framework="" version="" source="common/services/clock/xmega/osc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/xmega/pll.h" framework="" version="" source="common/services/clock/xmega/pll.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/xmega/sysclk.c" framework="" version="" source="common/services/clock/xmega/sysclk.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/clock/xmega/sysclk.h" framework="" version="" source="common/services/clock/xmega/sysclk.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/delay/delay.h" framework="" version="" source="common/services/delay/delay.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/delay/xmega/cycle_counter.h" framework="" version="" source="common/services/delay/xmega/cycle_counter.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/gpio/gpio.h" framework="" version="" source="common/services/gpio/gpio.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/gpio/xmega_gpio/xmega_gpio.h" framework="" version="" source="common/services/gpio/xmega_gpio/xmega_gpio.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/ioport/ioport.h" framework="" version="" source="common/services/ioport/ioport.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/ioport/xmega/ioport.h" framework="" version="" source="common/services/ioport/xmega/ioport.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/ioport/xmega/ioport_compat.c" framework="" version="" source="common/services/ioport/xmega/ioport_compat.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/ioport/xmega/ioport_compat.h" framework="" version="" source="common/services/ioport/xmega/ioport_compat.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/sleepmgr/sleepmgr.h" framework="" version="" source="common/services/sleepmgr/sleepmgr.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/sleepmgr/xmega/sleepmgr.c" framework="" version="" source="common/services/sleepmgr/xmega/sleepmgr.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/sleepmgr/xmega/sleepmgr.h" framework="" version="" source="common/services/sleepmgr/xmega/sleepmgr.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/interrupt.h" framework="" version="" source="common/utils/interrupt.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/interrupt/interrupt_avr8.h" framework="" version="" source="common/utils/interrupt/interrupt_avr8.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/make/Makefile.avr.in" framework="" version="" source="common/utils/make/Makefile.avr.in" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/parts.h" framework="" version="" source="common/utils/parts.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/boards/board.h" framework="" version="" source="common/boards/board.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/genclk.h" framework="" version="" source="common/services/clock/genclk.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/osc.h" framework="" version="" source="common/services/clock/osc.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/pll.h" framework="" version="" source="common/services/clock/pll.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/sysclk.h" framework="" version="" source="common/services/clock/sysclk.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/xmega/osc.h" framework="" version="" source="common/services/clock/xmega/osc.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/xmega/pll.h" framework="" version="" source="common/services/clock/xmega/pll.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/xmega/sysclk.c" framework="" version="" source="common/services/clock/xmega/sysclk.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/clock/xmega/sysclk.h" framework="" version="" source="common/services/clock/xmega/sysclk.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/delay/delay.h" framework="" version="" source="common/services/delay/delay.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/delay/xmega/cycle_counter.h" framework="" version="" source="common/services/delay/xmega/cycle_counter.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/gpio/gpio.h" framework="" version="" source="common/services/gpio/gpio.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h" framework="" version="" source="common/services/gpio/xmega_gpio/xmega_gpio.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/ioport/ioport.h" framework="" version="" source="common/services/ioport/ioport.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/ioport/xmega/ioport.h" framework="" version="" source="common/services/ioport/xmega/ioport.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/ioport/xmega/ioport_compat.c" framework="" version="" source="common/services/ioport/xmega/ioport_compat.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/ioport/xmega/ioport_compat.h" framework="" version="" source="common/services/ioport/xmega/ioport_compat.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/sleepmgr/sleepmgr.h" framework="" version="" source="common/services/sleepmgr/sleepmgr.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/sleepmgr/xmega/sleepmgr.c" framework="" version="" source="common/services/sleepmgr/xmega/sleepmgr.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/sleepmgr/xmega/sleepmgr.h" framework="" version="" source="common/services/sleepmgr/xmega/sleepmgr.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/interrupt.h" framework="" version="" source="common/utils/interrupt.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/interrupt/interrupt_avr8.h" framework="" version="" source="common/utils/interrupt/interrupt_avr8.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/make/Makefile.avr.in" framework="" version="" source="common/utils/make/Makefile.avr.in" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/parts.h" framework="" version="" source="common/utils/parts.h" changed="False" content-id="Atmel.ASF" />
     <file path="adc_sensors.c" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/adc_sensors.c" changed="False" content-id="Atmel.ASF" />
     <file path="adc_sensors.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/adc_sensors.h" changed="False" content-id="Atmel.ASF" />
-    <file path="config/conf_adc.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_adc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_application.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_application.h" changed="False" content-id="Atmel.ASF" />
-    <file path="config/conf_board.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_board.h" changed="False" content-id="Atmel.ASF" />
-    <file path="config/conf_clock.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_clock.h" changed="False" content-id="Atmel.ASF" />
-    <file path="config/conf_rtc32.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_rtc32.h" changed="False" content-id="Atmel.ASF" />
-    <file path="config/conf_sleepmgr.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_sleepmgr.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/config/conf_adc.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_adc.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_application.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_application.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/config/conf_board.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_board.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/config/conf_clock.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_clock.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/config/conf_rtc32.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_rtc32.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/config/conf_sleepmgr.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/atxmega256a3bu_xmega_a3bu_xplained/conf_sleepmgr.h" changed="False" content-id="Atmel.ASF" />
     <file path="bitmaps.c" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/bitmaps.c" changed="False" content-id="Atmel.ASF" />
     <file path="bitmaps.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/bitmaps.h" changed="False" content-id="Atmel.ASF" />
     <file path="cdc.c" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/cdc.c" changed="False" content-id="Atmel.ASF" />
@@ -109,52 +109,52 @@
     <file path="qtouch/touch_qt_config.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/qtouch/touch_qt_config.h" changed="False" content-id="Atmel.ASF" />
     <file path="timezone.c" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/timezone.c" changed="False" content-id="Atmel.ASF" />
     <file path="timezone.h" framework="" version="" source="xmega/applications/xmega_a3bu_xplained_demo/timezone.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/boards/xmega_a3bu_xplained/init.c" framework="" version="" source="xmega/boards/xmega_a3bu_xplained/init.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/boards/xmega_a3bu_xplained/led.h" framework="" version="" source="xmega/boards/xmega_a3bu_xplained/led.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h" framework="" version="" source="xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/adc/adc.c" framework="" version="" source="xmega/drivers/adc/adc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/adc/adc.h" framework="" version="" source="xmega/drivers/adc/adc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/adc/xmega_aau/adc_aau.c" framework="" version="" source="xmega/drivers/adc/xmega_aau/adc_aau.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/cpu/ccp.h" framework="" version="" source="xmega/drivers/cpu/ccp.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/cpu/ccp.s" framework="" version="" source="xmega/drivers/cpu/ccp.s" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/cpu/xmega_reset_cause.h" framework="" version="" source="xmega/drivers/cpu/xmega_reset_cause.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/nvm/nvm.c" framework="" version="" source="xmega/drivers/nvm/nvm.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/nvm/nvm.h" framework="" version="" source="xmega/drivers/nvm/nvm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/nvm/nvm_asm.s" framework="" version="" source="xmega/drivers/nvm/nvm_asm.s" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/pmic/pmic.h" framework="" version="" source="xmega/drivers/pmic/pmic.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/rtc32/rtc32.c" framework="" version="" source="xmega/drivers/rtc32/rtc32.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/rtc32/rtc32.h" framework="" version="" source="xmega/drivers/rtc32/rtc32.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/sleep/sleep.h" framework="" version="" source="xmega/drivers/sleep/sleep.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/tc/tc.c" framework="" version="" source="xmega/drivers/tc/tc.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/tc/tc.h" framework="" version="" source="xmega/drivers/tc/tc.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/assembler.h" framework="" version="" source="xmega/utils/assembler.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/assembler/gas.h" framework="" version="" source="xmega/utils/assembler/gas.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/bit_handling/clz_ctz.h" framework="" version="" source="xmega/utils/bit_handling/clz_ctz.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/compiler.h" framework="" version="" source="xmega/utils/compiler.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/preprocessor/mrepeat.h" framework="" version="" source="xmega/utils/preprocessor/mrepeat.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/preprocessor/preprocessor.h" framework="" version="" source="xmega/utils/preprocessor/preprocessor.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/preprocessor/stringz.h" framework="" version="" source="xmega/utils/preprocessor/stringz.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/preprocessor/tpaste.h" framework="" version="" source="xmega/utils/preprocessor/tpaste.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/progmem.h" framework="" version="" source="xmega/utils/progmem.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/utils/status_codes.h" framework="" version="" source="xmega/utils/status_codes.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/wdt/wdt.c" framework="" version="3.8.1" source="xmega\drivers\wdt\wdt.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/wdt/wdt.h" framework="" version="3.8.1" source="xmega\drivers\wdt\wdt.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/usart/usart.c" framework="" version="3.8.1" source="xmega\drivers\usart\usart.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/drivers/usart/usart.h" framework="" version="3.8.1" source="xmega\drivers\usart\usart.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/services/pwm/pwm.c" framework="" version="3.8.1" source="xmega\services\pwm\pwm.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/services/pwm/pwm.h" framework="" version="3.8.1" source="xmega\services\pwm\pwm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/drivers/nvm/xmega/xmega_nvm.c" framework="" version="3.8.1" source="common\drivers\nvm\xmega\xmega_nvm.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/drivers/nvm/common_nvm.h" framework="" version="3.8.1" source="common\drivers\nvm\common_nvm.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/boards/xmega_a3bu_xplained/init.c" framework="" version="" source="xmega/boards/xmega_a3bu_xplained/init.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/boards/xmega_a3bu_xplained/led.h" framework="" version="" source="xmega/boards/xmega_a3bu_xplained/led.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h" framework="" version="" source="xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/adc/adc.c" framework="" version="" source="xmega/drivers/adc/adc.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/adc/adc.h" framework="" version="" source="xmega/drivers/adc/adc.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c" framework="" version="" source="xmega/drivers/adc/xmega_aau/adc_aau.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/cpu/ccp.h" framework="" version="" source="xmega/drivers/cpu/ccp.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/cpu/ccp.s" framework="" version="" source="xmega/drivers/cpu/ccp.s" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/cpu/xmega_reset_cause.h" framework="" version="" source="xmega/drivers/cpu/xmega_reset_cause.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/nvm/nvm.c" framework="" version="" source="xmega/drivers/nvm/nvm.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/nvm/nvm.h" framework="" version="" source="xmega/drivers/nvm/nvm.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/nvm/nvm_asm.s" framework="" version="" source="xmega/drivers/nvm/nvm_asm.s" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/pmic/pmic.h" framework="" version="" source="xmega/drivers/pmic/pmic.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/rtc32/rtc32.c" framework="" version="" source="xmega/drivers/rtc32/rtc32.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/rtc32/rtc32.h" framework="" version="" source="xmega/drivers/rtc32/rtc32.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/sleep/sleep.h" framework="" version="" source="xmega/drivers/sleep/sleep.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/tc/tc.c" framework="" version="" source="xmega/drivers/tc/tc.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/tc/tc.h" framework="" version="" source="xmega/drivers/tc/tc.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/assembler.h" framework="" version="" source="xmega/utils/assembler.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/assembler/gas.h" framework="" version="" source="xmega/utils/assembler/gas.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/bit_handling/clz_ctz.h" framework="" version="" source="xmega/utils/bit_handling/clz_ctz.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/compiler.h" framework="" version="" source="xmega/utils/compiler.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/preprocessor/mrepeat.h" framework="" version="" source="xmega/utils/preprocessor/mrepeat.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/preprocessor/preprocessor.h" framework="" version="" source="xmega/utils/preprocessor/preprocessor.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/preprocessor/stringz.h" framework="" version="" source="xmega/utils/preprocessor/stringz.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/preprocessor/tpaste.h" framework="" version="" source="xmega/utils/preprocessor/tpaste.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/progmem.h" framework="" version="" source="xmega/utils/progmem.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/utils/status_codes.h" framework="" version="" source="xmega/utils/status_codes.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/wdt/wdt.c" framework="" version="3.8.1" source="xmega\drivers\wdt\wdt.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/wdt/wdt.h" framework="" version="3.8.1" source="xmega\drivers\wdt\wdt.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/usart/usart.c" framework="" version="3.8.1" source="xmega\drivers\usart\usart.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/drivers/usart/usart.h" framework="" version="3.8.1" source="xmega\drivers\usart\usart.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/services/pwm/pwm.c" framework="" version="3.8.1" source="xmega\services\pwm\pwm.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/services/pwm/pwm.h" framework="" version="3.8.1" source="xmega\services\pwm\pwm.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/drivers/nvm/xmega/xmega_nvm.c" framework="" version="3.8.1" source="common\drivers\nvm\xmega\xmega_nvm.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/drivers/nvm/common_nvm.h" framework="" version="3.8.1" source="common\drivers\nvm\common_nvm.h" changed="False" content-id="Atmel.ASF" />
     <file path="Config/conf_nvm.h" framework="" version="3.8.1" source="common\drivers\nvm\xmega\module_config\conf_nvm.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/serial/usart_serial.c" framework="" version="3.8.1" source="common\services\serial\usart_serial.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/serial/xmega_usart/usart_serial.h" framework="" version="3.8.1" source="common\services\serial\xmega_usart\usart_serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/services/serial/serial.h" framework="" version="3.8.1" source="common\services\serial\serial.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/serial/usart_serial.c" framework="" version="3.8.1" source="common\services\serial\usart_serial.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/serial/xmega_usart/usart_serial.h" framework="" version="3.8.1" source="common\services\serial\xmega_usart\usart_serial.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/services/serial/serial.h" framework="" version="3.8.1" source="common\services\serial\serial.h" changed="False" content-id="Atmel.ASF" />
     <file path="Config/conf_usart_serial.h" framework="" version="3.8.1" source="common\services\serial\xmega_usart\module_config\conf_usart_serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/stdio/read.c" framework="" version="3.8.1" source="common\utils\stdio\read.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/stdio/write.c" framework="" version="3.8.1" source="common\utils\stdio\write.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/common/utils/stdio/stdio_serial/stdio_serial.h" framework="" version="3.8.1" source="common\utils\stdio\stdio_serial\stdio_serial.h" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/services/timeout/timeout.c" framework="" version="3.8.1" source="xmega\services\timeout\timeout.c" changed="False" content-id="Atmel.ASF" />
-    <file path="ASF/xmega/services/timeout/timeout.h" framework="" version="3.8.1" source="xmega\services\timeout\timeout.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/stdio/read.c" framework="" version="3.8.1" source="common\utils\stdio\read.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/stdio/write.c" framework="" version="3.8.1" source="common\utils\stdio\write.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/common/utils/stdio/stdio_serial/stdio_serial.h" framework="" version="3.8.1" source="common\utils\stdio\stdio_serial\stdio_serial.h" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/services/timeout/timeout.c" framework="" version="3.8.1" source="xmega\services\timeout\timeout.c" changed="False" content-id="Atmel.ASF" />
+    <file path="external/ASF/xmega/services/timeout/timeout.h" framework="" version="3.8.1" source="xmega\services\timeout\timeout.h" changed="False" content-id="Atmel.ASF" />
     <file path="Config/conf_timeout.h" framework="" version="3.8.1" source="xmega\services\timeout\module_config_rtc32\conf_timeout.h" changed="False" content-id="Atmel.ASF" />
   </files>
   <documentation help="http://asf.atmel.com/docs/3.8.1/xmega.applications.xmega_a3bu_xplained_demo.xmega_a3bu_xplained/html/index.html" />
@@ -239,33 +239,33 @@
         <avrgcc.compiler.directories.IncludePaths>
           <ListValues>
             <Value>..</Value>
-            <Value>../config</Value>
-            <Value>../ASF/xmega/drivers/rtc32</Value>
-            <Value>../ASF/xmega/drivers/pmic</Value>
-            <Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
-            <Value>../ASF/xmega/utils/preprocessor</Value>
-            <Value>../ASF/common/utils</Value>
-            <Value>../ASF/common/services/sleepmgr</Value>
-            <Value>../ASF/xmega/drivers/sleep</Value>
-            <Value>../ASF/common/services/gpio</Value>
-            <Value>../ASF/xmega/drivers/tc</Value>
-            <Value>../ASF/xmega/drivers/adc</Value>
-            <Value>../ASF/xmega/drivers/cpu</Value>
-            <Value>../ASF/common/boards</Value>
-            <Value>../ASF/common/services/ioport</Value>
-            <Value>../ASF/xmega/drivers/nvm</Value>
-            <Value>../ASF/xmega/boards</Value>
-            <Value>../ASF/xmega/utils</Value>
-            <Value>../ASF/xmega/drivers/wdt</Value>
-            <Value>../ASF/common/services/clock</Value>
-            <Value>../ASF/common/services/delay</Value>
-            <Value>../ASF/xmega/drivers/usart</Value>
-            <Value>../ASF/xmega/services/pwm</Value>
-            <Value>../ASF/common/drivers/nvm</Value>
-            <Value>../ASF/common/services/serial/xmega_usart</Value>
-            <Value>../ASF/common/services/serial</Value>
-            <Value>../ASF/common/utils/stdio/stdio_serial</Value>
-            <Value>../ASF/xmega/services/timeout</Value>
+            <Value>../external/config</Value>
+            <Value>../external/ASF/xmega/drivers/rtc32</Value>
+            <Value>../external/ASF/xmega/drivers/pmic</Value>
+            <Value>../external/ASF/xmega/boards/xmega_a3bu_xplained</Value>
+            <Value>../external/ASF/xmega/utils/preprocessor</Value>
+            <Value>../external/ASF/common/utils</Value>
+            <Value>../external/ASF/common/services/sleepmgr</Value>
+            <Value>../external/ASF/xmega/drivers/sleep</Value>
+            <Value>../external/ASF/common/services/gpio</Value>
+            <Value>../external/ASF/xmega/drivers/tc</Value>
+            <Value>../external/ASF/xmega/drivers/adc</Value>
+            <Value>../external/ASF/xmega/drivers/cpu</Value>
+            <Value>../external/ASF/common/boards</Value>
+            <Value>../external/ASF/common/services/ioport</Value>
+            <Value>../external/ASF/xmega/drivers/nvm</Value>
+            <Value>../external/ASF/xmega/boards</Value>
+            <Value>../external/ASF/xmega/utils</Value>
+            <Value>../external/ASF/xmega/drivers/wdt</Value>
+            <Value>../external/ASF/common/services/clock</Value>
+            <Value>../external/ASF/common/services/delay</Value>
+            <Value>../external/ASF/xmega/drivers/usart</Value>
+            <Value>../external/ASF/xmega/services/pwm</Value>
+            <Value>../external/ASF/common/drivers/nvm</Value>
+            <Value>../external/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../external/ASF/common/services/serial</Value>
+            <Value>../external/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../external/ASF/xmega/services/timeout</Value>
             <Value>../../../src</Value>
             <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
           </ListValues>
@@ -284,34 +284,34 @@
         <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=XMEGA_A3BU_XPLAINED -DIOPORT_XMEGA_COMPAT</avrgcc.assembler.general.AssemblerFlags>
         <avrgcc.assembler.general.IncludePaths>
           <ListValues>
-            <Value>../ASF/xmega/drivers/rtc32</Value>
-            <Value>../ASF/xmega/drivers/pmic</Value>
-            <Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
-            <Value>../ASF/xmega/drivers/nvm</Value>
-            <Value>../ASF/xmega/utils/preprocessor</Value>
-            <Value>../ASF/common/utils</Value>
-            <Value>../ASF/common/services/sleepmgr</Value>
-            <Value>../ASF/xmega/drivers/sleep</Value>
-            <Value>../ASF/common/services/gpio</Value>
-            <Value>../ASF/xmega/drivers/tc</Value>
-            <Value>../ASF/xmega/drivers/adc</Value>
-            <Value>../ASF/xmega/drivers/cpu</Value>
-            <Value>../ASF/common/boards</Value>
-            <Value>../ASF/common/services/ioport</Value>
-            <Value>../ASF/xmega/boards</Value>
-            <Value>../ASF/xmega/utils</Value>
-            <Value>../ASF/common/services/clock</Value>
-            <Value>../ASF/common/services/delay</Value>
-            <Value>../ASF/xmega/drivers/wdt</Value>
-            <Value>../ASF/xmega/drivers/usart</Value>
-            <Value>../config</Value>
+            <Value>../external/ASF/xmega/drivers/rtc32</Value>
+            <Value>../external/ASF/xmega/drivers/pmic</Value>
+            <Value>../external/ASF/xmega/boards/xmega_a3bu_xplained</Value>
+            <Value>../external/ASF/xmega/drivers/nvm</Value>
+            <Value>../external/ASF/xmega/utils/preprocessor</Value>
+            <Value>../external/ASF/common/utils</Value>
+            <Value>../external/ASF/common/services/sleepmgr</Value>
+            <Value>../external/ASF/xmega/drivers/sleep</Value>
+            <Value>../external/ASF/common/services/gpio</Value>
+            <Value>../external/ASF/xmega/drivers/tc</Value>
+            <Value>../external/ASF/xmega/drivers/adc</Value>
+            <Value>../external/ASF/xmega/drivers/cpu</Value>
+            <Value>../external/ASF/common/boards</Value>
+            <Value>../external/ASF/common/services/ioport</Value>
+            <Value>../external/ASF/xmega/boards</Value>
+            <Value>../external/ASF/xmega/utils</Value>
+            <Value>../external/ASF/common/services/clock</Value>
+            <Value>../external/ASF/common/services/delay</Value>
+            <Value>../external/ASF/xmega/drivers/wdt</Value>
+            <Value>../external/ASF/xmega/drivers/usart</Value>
+            <Value>../external/config</Value>
             <Value>.</Value>
-            <Value>../ASF/xmega/services/pwm</Value>
-            <Value>../ASF/common/drivers/nvm</Value>
-            <Value>../ASF/common/services/serial/xmega_usart</Value>
-            <Value>../ASF/common/services/serial</Value>
-            <Value>../ASF/common/utils/stdio/stdio_serial</Value>
-            <Value>../ASF/xmega/services/timeout</Value>
+            <Value>../external/ASF/xmega/services/pwm</Value>
+            <Value>../external/ASF/common/drivers/nvm</Value>
+            <Value>../external/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../external/ASF/common/services/serial</Value>
+            <Value>../external/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../external/ASF/xmega/services/timeout</Value>
           </ListValues>
         </avrgcc.assembler.general.IncludePaths>
         <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
@@ -344,33 +344,33 @@
         <avrgcc.compiler.directories.IncludePaths>
           <ListValues>
             <Value>..</Value>
-            <Value>../config</Value>
-            <Value>../ASF/xmega/drivers/rtc32</Value>
-            <Value>../ASF/xmega/drivers/pmic</Value>
-            <Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
-            <Value>../ASF/xmega/utils/preprocessor</Value>
-            <Value>../ASF/common/utils</Value>
-            <Value>../ASF/common/services/sleepmgr</Value>
-            <Value>../ASF/xmega/drivers/sleep</Value>
-            <Value>../ASF/common/services/gpio</Value>
-            <Value>../ASF/xmega/drivers/tc</Value>
-            <Value>../ASF/xmega/drivers/adc</Value>
-            <Value>../ASF/xmega/drivers/cpu</Value>
-            <Value>../ASF/common/boards</Value>
-            <Value>../ASF/common/services/ioport</Value>
-            <Value>../ASF/xmega/drivers/nvm</Value>
-            <Value>../ASF/xmega/boards</Value>
-            <Value>../ASF/xmega/utils</Value>
-            <Value>../ASF/xmega/drivers/wdt</Value>
-            <Value>../ASF/common/services/clock</Value>
-            <Value>../ASF/common/services/delay</Value>
-            <Value>../ASF/xmega/drivers/usart</Value>
-            <Value>../ASF/xmega/services/pwm</Value>
-            <Value>../ASF/common/drivers/nvm</Value>
-            <Value>../ASF/common/services/serial/xmega_usart</Value>
-            <Value>../ASF/common/services/serial</Value>
-            <Value>../ASF/common/utils/stdio/stdio_serial</Value>
-            <Value>../ASF/xmega/services/timeout</Value>
+            <Value>../external/config</Value>
+            <Value>../external/ASF/xmega/drivers/rtc32</Value>
+            <Value>../external/ASF/xmega/drivers/pmic</Value>
+            <Value>../external/ASF/xmega/boards/xmega_a3bu_xplained</Value>
+            <Value>../external/ASF/xmega/utils/preprocessor</Value>
+            <Value>../external/ASF/common/utils</Value>
+            <Value>../external/ASF/common/services/sleepmgr</Value>
+            <Value>../external/ASF/xmega/drivers/sleep</Value>
+            <Value>../external/ASF/common/services/gpio</Value>
+            <Value>../external/ASF/xmega/drivers/tc</Value>
+            <Value>../external/ASF/xmega/drivers/adc</Value>
+            <Value>../external/ASF/xmega/drivers/cpu</Value>
+            <Value>../external/ASF/common/boards</Value>
+            <Value>../external/ASF/common/services/ioport</Value>
+            <Value>../external/ASF/xmega/drivers/nvm</Value>
+            <Value>../external/ASF/xmega/boards</Value>
+            <Value>../external/ASF/xmega/utils</Value>
+            <Value>../external/ASF/xmega/drivers/wdt</Value>
+            <Value>../external/ASF/common/services/clock</Value>
+            <Value>../external/ASF/common/services/delay</Value>
+            <Value>../external/ASF/xmega/drivers/usart</Value>
+            <Value>../external/ASF/xmega/services/pwm</Value>
+            <Value>../external/ASF/common/drivers/nvm</Value>
+            <Value>../external/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../external/ASF/common/services/serial</Value>
+            <Value>../external/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../external/ASF/xmega/services/timeout</Value>
             <Value>../../../src</Value>
             <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
           </ListValues>
@@ -389,34 +389,34 @@
         <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=XMEGA_A3BU_XPLAINED -DIOPORT_XMEGA_COMPAT</avrgcc.assembler.general.AssemblerFlags>
         <avrgcc.assembler.general.IncludePaths>
           <ListValues>
-            <Value>../ASF/xmega/drivers/rtc32</Value>
-            <Value>../ASF/xmega/drivers/pmic</Value>
-            <Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
-            <Value>../ASF/xmega/drivers/nvm</Value>
-            <Value>../ASF/xmega/utils/preprocessor</Value>
-            <Value>../ASF/common/utils</Value>
-            <Value>../ASF/common/services/sleepmgr</Value>
-            <Value>../ASF/xmega/drivers/sleep</Value>
-            <Value>../ASF/common/services/gpio</Value>
-            <Value>../ASF/xmega/drivers/tc</Value>
-            <Value>../ASF/xmega/drivers/adc</Value>
-            <Value>../ASF/xmega/drivers/cpu</Value>
-            <Value>../ASF/common/boards</Value>
-            <Value>../ASF/common/services/ioport</Value>
-            <Value>../ASF/xmega/boards</Value>
-            <Value>../ASF/xmega/utils</Value>
-            <Value>../ASF/common/services/clock</Value>
-            <Value>../ASF/common/services/delay</Value>
-            <Value>../ASF/xmega/drivers/wdt</Value>
-            <Value>../ASF/xmega/drivers/usart</Value>
-            <Value>../config</Value>
+            <Value>../external/ASF/xmega/drivers/rtc32</Value>
+            <Value>../external/ASF/xmega/drivers/pmic</Value>
+            <Value>../external/ASF/xmega/boards/xmega_a3bu_xplained</Value>
+            <Value>../external/ASF/xmega/drivers/nvm</Value>
+            <Value>../external/ASF/xmega/utils/preprocessor</Value>
+            <Value>../external/ASF/common/utils</Value>
+            <Value>../external/ASF/common/services/sleepmgr</Value>
+            <Value>../external/ASF/xmega/drivers/sleep</Value>
+            <Value>../external/ASF/common/services/gpio</Value>
+            <Value>../external/ASF/xmega/drivers/tc</Value>
+            <Value>../external/ASF/xmega/drivers/adc</Value>
+            <Value>../external/ASF/xmega/drivers/cpu</Value>
+            <Value>../external/ASF/common/boards</Value>
+            <Value>../external/ASF/common/services/ioport</Value>
+            <Value>../external/ASF/xmega/boards</Value>
+            <Value>../external/ASF/xmega/utils</Value>
+            <Value>../external/ASF/common/services/clock</Value>
+            <Value>../external/ASF/common/services/delay</Value>
+            <Value>../external/ASF/xmega/drivers/wdt</Value>
+            <Value>../external/ASF/xmega/drivers/usart</Value>
+            <Value>../external/config</Value>
             <Value>.</Value>
-            <Value>../ASF/xmega/services/pwm</Value>
-            <Value>../ASF/common/drivers/nvm</Value>
-            <Value>../ASF/common/services/serial/xmega_usart</Value>
-            <Value>../ASF/common/services/serial</Value>
-            <Value>../ASF/common/utils/stdio/stdio_serial</Value>
-            <Value>../ASF/xmega/services/timeout</Value>
+            <Value>../external/ASF/xmega/services/pwm</Value>
+            <Value>../external/ASF/common/drivers/nvm</Value>
+            <Value>../external/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../external/ASF/common/services/serial</Value>
+            <Value>../external/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../external/ASF/xmega/services/timeout</Value>
           </ListValues>
         </avrgcc.assembler.general.IncludePaths>
         <avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
@@ -453,33 +453,33 @@
         <avrgcc.compiler.directories.IncludePaths>
           <ListValues>
             <Value>..</Value>
-            <Value>../config</Value>
-            <Value>../ASF/xmega/drivers/rtc32</Value>
-            <Value>../ASF/xmega/drivers/pmic</Value>
-            <Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
-            <Value>../ASF/xmega/utils/preprocessor</Value>
-            <Value>../ASF/common/utils</Value>
-            <Value>../ASF/common/services/sleepmgr</Value>
-            <Value>../ASF/xmega/drivers/sleep</Value>
-            <Value>../ASF/common/services/gpio</Value>
-            <Value>../ASF/xmega/drivers/tc</Value>
-            <Value>../ASF/xmega/drivers/adc</Value>
-            <Value>../ASF/xmega/drivers/cpu</Value>
-            <Value>../ASF/common/boards</Value>
-            <Value>../ASF/common/services/ioport</Value>
-            <Value>../ASF/xmega/drivers/nvm</Value>
-            <Value>../ASF/xmega/boards</Value>
-            <Value>../ASF/xmega/utils</Value>
-            <Value>../ASF/xmega/drivers/wdt</Value>
-            <Value>../ASF/common/services/clock</Value>
-            <Value>../ASF/common/services/delay</Value>
-            <Value>../ASF/xmega/drivers/usart</Value>
-            <Value>../ASF/xmega/services/pwm</Value>
-            <Value>../ASF/common/drivers/nvm</Value>
-            <Value>../ASF/common/services/serial/xmega_usart</Value>
-            <Value>../ASF/common/services/serial</Value>
-            <Value>../ASF/common/utils/stdio/stdio_serial</Value>
-            <Value>../ASF/xmega/services/timeout</Value>
+            <Value>../external/config</Value>
+            <Value>../external/ASF/xmega/drivers/rtc32</Value>
+            <Value>../external/ASF/xmega/drivers/pmic</Value>
+            <Value>../external/ASF/xmega/boards/xmega_a3bu_xplained</Value>
+            <Value>../external/ASF/xmega/utils/preprocessor</Value>
+            <Value>../external/ASF/common/utils</Value>
+            <Value>../external/ASF/common/services/sleepmgr</Value>
+            <Value>../external/ASF/xmega/drivers/sleep</Value>
+            <Value>../external/ASF/common/services/gpio</Value>
+            <Value>../external/ASF/xmega/drivers/tc</Value>
+            <Value>../external/ASF/xmega/drivers/adc</Value>
+            <Value>../external/ASF/xmega/drivers/cpu</Value>
+            <Value>../external/ASF/common/boards</Value>
+            <Value>../external/ASF/common/services/ioport</Value>
+            <Value>../external/ASF/xmega/drivers/nvm</Value>
+            <Value>../external/ASF/xmega/boards</Value>
+            <Value>../external/ASF/xmega/utils</Value>
+            <Value>../external/ASF/xmega/drivers/wdt</Value>
+            <Value>../external/ASF/common/services/clock</Value>
+            <Value>../external/ASF/common/services/delay</Value>
+            <Value>../external/ASF/xmega/drivers/usart</Value>
+            <Value>../external/ASF/xmega/services/pwm</Value>
+            <Value>../external/ASF/common/drivers/nvm</Value>
+            <Value>../external/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../external/ASF/common/services/serial</Value>
+            <Value>../external/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../external/ASF/xmega/services/timeout</Value>
             <Value>../../../src</Value>
             <Value>%24(PackRepoDir)\atmel\XMEGAA_DFP\1.0.36\include</Value>
           </ListValues>
@@ -498,34 +498,34 @@
         <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=XMEGA_A3BU_XPLAINED -DIOPORT_XMEGA_COMPAT</avrgcc.assembler.general.AssemblerFlags>
         <avrgcc.assembler.general.IncludePaths>
           <ListValues>
-            <Value>../ASF/xmega/drivers/rtc32</Value>
-            <Value>../ASF/xmega/drivers/pmic</Value>
-            <Value>../ASF/xmega/boards/xmega_a3bu_xplained</Value>
-            <Value>../ASF/xmega/drivers/nvm</Value>
-            <Value>../ASF/xmega/utils/preprocessor</Value>
-            <Value>../ASF/common/utils</Value>
-            <Value>../ASF/common/services/sleepmgr</Value>
-            <Value>../ASF/xmega/drivers/sleep</Value>
-            <Value>../ASF/common/services/gpio</Value>
-            <Value>../ASF/xmega/drivers/tc</Value>
-            <Value>../ASF/xmega/drivers/adc</Value>
-            <Value>../ASF/xmega/drivers/cpu</Value>
-            <Value>../ASF/common/boards</Value>
-            <Value>../ASF/common/services/ioport</Value>
-            <Value>../ASF/xmega/boards</Value>
-            <Value>../ASF/xmega/utils</Value>
-            <Value>../ASF/common/services/clock</Value>
-            <Value>../ASF/common/services/delay</Value>
-            <Value>../ASF/xmega/drivers/wdt</Value>
-            <Value>../ASF/xmega/drivers/usart</Value>
-            <Value>../config</Value>
+            <Value>../external/ASF/xmega/drivers/rtc32</Value>
+            <Value>../external/ASF/xmega/drivers/pmic</Value>
+            <Value>../external/ASF/xmega/boards/xmega_a3bu_xplained</Value>
+            <Value>../external/ASF/xmega/drivers/nvm</Value>
+            <Value>../external/ASF/xmega/utils/preprocessor</Value>
+            <Value>../external/ASF/common/utils</Value>
+            <Value>../external/ASF/common/services/sleepmgr</Value>
+            <Value>../external/ASF/xmega/drivers/sleep</Value>
+            <Value>../external/ASF/common/services/gpio</Value>
+            <Value>../external/ASF/xmega/drivers/tc</Value>
+            <Value>../external/ASF/xmega/drivers/adc</Value>
+            <Value>../external/ASF/xmega/drivers/cpu</Value>
+            <Value>../external/ASF/common/boards</Value>
+            <Value>../external/ASF/common/services/ioport</Value>
+            <Value>../external/ASF/xmega/boards</Value>
+            <Value>../external/ASF/xmega/utils</Value>
+            <Value>../external/ASF/common/services/clock</Value>
+            <Value>../external/ASF/common/services/delay</Value>
+            <Value>../external/ASF/xmega/drivers/wdt</Value>
+            <Value>../external/ASF/xmega/drivers/usart</Value>
+            <Value>../external/config</Value>
             <Value>.</Value>
-            <Value>../ASF/xmega/services/pwm</Value>
-            <Value>../ASF/common/drivers/nvm</Value>
-            <Value>../ASF/common/services/serial/xmega_usart</Value>
-            <Value>../ASF/common/services/serial</Value>
-            <Value>../ASF/common/utils/stdio/stdio_serial</Value>
-            <Value>../ASF/xmega/services/timeout</Value>
+            <Value>../external/ASF/xmega/services/pwm</Value>
+            <Value>../external/ASF/common/drivers/nvm</Value>
+            <Value>../external/ASF/common/services/serial/xmega_usart</Value>
+            <Value>../external/ASF/common/services/serial</Value>
+            <Value>../external/ASF/common/utils/stdio/stdio_serial</Value>
+            <Value>../external/ASF/xmega/services/timeout</Value>
           </ListValues>
         </avrgcc.assembler.general.IncludePaths>
         <avrgcc.compiler.optimization.DebugLevel>Maximum (-g3)</avrgcc.compiler.optimization.DebugLevel>
@@ -534,56 +534,56 @@
     </ToolchainSettings>
   </PropertyGroup>
   <ItemGroup>
-    <Folder Include="ASF\" />
-    <Folder Include="ASF\common\" />
-    <Folder Include="ASF\common\boards\" />
-    <Folder Include="ASF\common\drivers\" />
-    <Folder Include="ASF\common\drivers\nvm\" />
-    <Folder Include="ASF\common\drivers\nvm\xmega\" />
-    <Folder Include="ASF\common\services\" />
-    <Folder Include="ASF\common\services\clock\" />
-    <Folder Include="ASF\common\services\clock\xmega\" />
-    <Folder Include="ASF\common\services\delay\" />
-    <Folder Include="ASF\common\services\delay\xmega\" />
-    <Folder Include="ASF\common\services\gpio\" />
-    <Folder Include="ASF\common\services\gpio\xmega_gpio\" />
-    <Folder Include="ASF\common\services\ioport\" />
-    <Folder Include="ASF\common\services\ioport\xmega\" />
-    <Folder Include="ASF\common\services\serial\" />
-    <Folder Include="ASF\common\services\serial\xmega_usart\" />
-    <Folder Include="ASF\common\services\sleepmgr\" />
-    <Folder Include="ASF\common\services\sleepmgr\xmega\" />
-    <Folder Include="ASF\common\utils\" />
-    <Folder Include="ASF\common\utils\interrupt\" />
-    <Folder Include="ASF\common\utils\make\" />
-    <Folder Include="ASF\common\utils\stdio\" />
-    <Folder Include="ASF\common\utils\stdio\stdio_serial\" />
-    <Folder Include="ASF\xmega\" />
-    <Folder Include="ASF\xmega\boards\" />
-    <Folder Include="ASF\xmega\boards\xmega_a3bu_xplained\" />
-    <Folder Include="ASF\xmega\drivers\" />
-    <Folder Include="ASF\xmega\drivers\adc\" />
-    <Folder Include="ASF\xmega\drivers\adc\xmega_aau\" />
-    <Folder Include="ASF\xmega\drivers\cpu\" />
-    <Folder Include="ASF\xmega\drivers\nvm\" />
-    <Folder Include="ASF\xmega\drivers\pmic\" />
-    <Folder Include="ASF\xmega\drivers\rtc32\" />
-    <Folder Include="ASF\xmega\drivers\sleep\" />
-    <Folder Include="ASF\xmega\drivers\tc\" />
-    <Folder Include="ASF\xmega\drivers\usart\" />
-    <Folder Include="ASF\xmega\drivers\wdt\" />
-    <Folder Include="ASF\xmega\services\" />
-    <Folder Include="ASF\xmega\services\pwm\" />
-    <Folder Include="ASF\xmega\services\timeout\" />
-    <Folder Include="ASF\xmega\utils\" />
-    <Folder Include="ASF\xmega\utils\assembler\" />
-    <Folder Include="ASF\xmega\utils\bit_handling\" />
-    <Folder Include="ASF\xmega\utils\preprocessor\" />
+    <Folder Include="external\ASF\" />
+    <Folder Include="external\ASF\common\" />
+    <Folder Include="external\ASF\common\boards\" />
+    <Folder Include="external\ASF\common\drivers\" />
+    <Folder Include="external\ASF\common\drivers\nvm\" />
+    <Folder Include="external\ASF\common\drivers\nvm\xmega\" />
+    <Folder Include="external\ASF\common\services\" />
+    <Folder Include="external\ASF\common\services\clock\" />
+    <Folder Include="external\ASF\common\services\clock\xmega\" />
+    <Folder Include="external\ASF\common\services\delay\" />
+    <Folder Include="external\ASF\common\services\delay\xmega\" />
+    <Folder Include="external\ASF\common\services\gpio\" />
+    <Folder Include="external\ASF\common\services\gpio\xmega_gpio\" />
+    <Folder Include="external\ASF\common\services\ioport\" />
+    <Folder Include="external\ASF\common\services\ioport\xmega\" />
+    <Folder Include="external\ASF\common\services\serial\" />
+    <Folder Include="external\ASF\common\services\serial\xmega_usart\" />
+    <Folder Include="external\ASF\common\services\sleepmgr\" />
+    <Folder Include="external\ASF\common\services\sleepmgr\xmega\" />
+    <Folder Include="external\ASF\common\utils\" />
+    <Folder Include="external\ASF\common\utils\interrupt\" />
+    <Folder Include="external\ASF\common\utils\make\" />
+    <Folder Include="external\ASF\common\utils\stdio\" />
+    <Folder Include="external\ASF\common\utils\stdio\stdio_serial\" />
+    <Folder Include="external\ASF\xmega\" />
+    <Folder Include="external\ASF\xmega\boards\" />
+    <Folder Include="external\ASF\xmega\boards\xmega_a3bu_xplained\" />
+    <Folder Include="external\ASF\xmega\drivers\" />
+    <Folder Include="external\ASF\xmega\drivers\adc\" />
+    <Folder Include="external\ASF\xmega\drivers\adc\xmega_aau\" />
+    <Folder Include="external\ASF\xmega\drivers\cpu\" />
+    <Folder Include="external\ASF\xmega\drivers\nvm\" />
+    <Folder Include="external\ASF\xmega\drivers\pmic\" />
+    <Folder Include="external\ASF\xmega\drivers\rtc32\" />
+    <Folder Include="external\ASF\xmega\drivers\sleep\" />
+    <Folder Include="external\ASF\xmega\drivers\tc\" />
+    <Folder Include="external\ASF\xmega\drivers\usart\" />
+    <Folder Include="external\ASF\xmega\drivers\wdt\" />
+    <Folder Include="external\ASF\xmega\services\" />
+    <Folder Include="external\ASF\xmega\services\pwm\" />
+    <Folder Include="external\ASF\xmega\services\timeout\" />
+    <Folder Include="external\ASF\xmega\utils\" />
+    <Folder Include="external\ASF\xmega\utils\assembler\" />
+    <Folder Include="external\ASF\xmega\utils\bit_handling\" />
+    <Folder Include="external\ASF\xmega\utils\preprocessor\" />
     <Folder Include="bacnet-stack\" />
-    <Folder Include="config\" />
+    <Folder Include="external\config\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="ASF\common\drivers\nvm\common_nvm.h">
+    <None Include="external\ASF\common\drivers\nvm\common_nvm.h">
       <SubType>compile</SubType>
     </None>
     <Compile Include="..\..\src\bacnet\datetime.c">
@@ -608,58 +608,58 @@
     <Compile Include="ai.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\common\drivers\nvm\xmega\xmega_nvm.c">
+    <Compile Include="external\ASF\common\drivers\nvm\xmega\xmega_nvm.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\common\services\serial\serial.h">
+    <None Include="external\ASF\common\services\serial\serial.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\common\services\serial\usart_serial.c">
+    <Compile Include="external\ASF\common\services\serial\usart_serial.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\common\services\serial\xmega_usart\usart_serial.h">
+    <None Include="external\ASF\common\services\serial\xmega_usart\usart_serial.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\common\utils\stdio\read.c">
+    <Compile Include="external\ASF\common\utils\stdio\read.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\common\utils\stdio\stdio_serial\stdio_serial.h">
+    <None Include="external\ASF\common\utils\stdio\stdio_serial\stdio_serial.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\common\utils\stdio\write.c">
+    <Compile Include="external\ASF\common\utils\stdio\write.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\nvm\nvm.c">
+    <Compile Include="external\ASF\xmega\drivers\nvm\nvm.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\nvm\nvm.h">
+    <Compile Include="external\ASF\xmega\drivers\nvm\nvm.h">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\nvm\nvm_asm.s">
+    <Compile Include="external\ASF\xmega\drivers\nvm\nvm_asm.s">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\usart\usart.c">
+    <Compile Include="external\ASF\xmega\drivers\usart\usart.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\xmega\drivers\usart\usart.h">
+    <None Include="external\ASF\xmega\drivers\usart\usart.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\xmega\drivers\wdt\wdt.c">
+    <Compile Include="external\ASF\xmega\drivers\wdt\wdt.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\xmega\drivers\wdt\wdt.h">
+    <None Include="external\ASF\xmega\drivers\wdt\wdt.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\xmega\services\pwm\pwm.c">
+    <Compile Include="external\ASF\xmega\services\pwm\pwm.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\xmega\services\pwm\pwm.h">
+    <None Include="external\ASF\xmega\services\pwm\pwm.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\xmega\services\timeout\timeout.c">
+    <Compile Include="external\ASF\xmega\services\timeout\timeout.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\xmega\services\timeout\timeout.h">
+    <None Include="external\ASF\xmega\services\timeout\timeout.h">
       <SubType>compile</SubType>
     </None>
     <Compile Include="..\..\src\bacnet\basic\service\s_cov.c">
@@ -692,13 +692,13 @@
     <Compile Include="bname.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="config\conf_nvm.h">
+    <None Include="external\config\conf_nvm.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_usart_serial.h">
+    <None Include="external\config\conf_usart_serial.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_timeout.h">
+    <None Include="external\config\conf_timeout.h">
       <SubType>compile</SubType>
     </None>
     <Compile Include="device.c">
@@ -890,166 +890,166 @@
     <None Include="asf.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_rtc32.h">
+    <None Include="external\config\conf_rtc32.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_sleepmgr.h">
+    <None Include="external\config\conf_sleepmgr.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_adc.h">
+    <None Include="external\config\conf_adc.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_board.h">
+    <None Include="external\config\conf_board.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="config\conf_clock.h">
+    <None Include="external\config\conf_clock.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\sysclk.h">
+    <None Include="external\ASF\common\services\clock\sysclk.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\utils\make\Makefile.avr.in">
+    <None Include="external\ASF\common\utils\make\Makefile.avr.in">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\boards\board.h">
+    <None Include="external\ASF\common\boards\board.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\ioport\ioport.h">
+    <None Include="external\ASF\common\services\ioport\ioport.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\pll.h">
+    <None Include="external\ASF\common\services\clock\pll.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\preprocessor\mrepeat.h">
+    <None Include="external\ASF\xmega\utils\preprocessor\mrepeat.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\boards\xmega_a3bu_xplained\led.h">
+    <None Include="external\ASF\xmega\boards\xmega_a3bu_xplained\led.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\bit_handling\clz_ctz.h">
+    <None Include="external\ASF\xmega\utils\bit_handling\clz_ctz.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\compiler.h">
+    <None Include="external\ASF\xmega\utils\compiler.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\preprocessor\preprocessor.h">
+    <None Include="external\ASF\xmega\utils\preprocessor\preprocessor.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\cpu\xmega_reset_cause.h">
+    <None Include="external\ASF\xmega\drivers\cpu\xmega_reset_cause.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\tc\tc.h">
+    <None Include="external\ASF\xmega\drivers\tc\tc.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\cpu\ccp.h">
+    <None Include="external\ASF\xmega\drivers\cpu\ccp.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\gpio\xmega_gpio\xmega_gpio.h">
+    <None Include="external\ASF\common\services\gpio\xmega_gpio\xmega_gpio.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\assembler.h">
+    <None Include="external\ASF\xmega\utils\assembler.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\adc\adc.h">
+    <None Include="external\ASF\xmega\drivers\adc\adc.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\sleepmgr\xmega\sleepmgr.h">
+    <None Include="external\ASF\common\services\sleepmgr\xmega\sleepmgr.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\assembler\gas.h">
+    <None Include="external\ASF\xmega\utils\assembler\gas.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\preprocessor\stringz.h">
+    <None Include="external\ASF\xmega\utils\preprocessor\stringz.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\pmic\pmic.h">
+    <None Include="external\ASF\xmega\drivers\pmic\pmic.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\boards\xmega_a3bu_xplained\xmega_a3bu_xplained.h">
+    <None Include="external\ASF\xmega\boards\xmega_a3bu_xplained\xmega_a3bu_xplained.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\sleep\sleep.h">
+    <None Include="external\ASF\xmega\drivers\sleep\sleep.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\utils\interrupt\interrupt_avr8.h">
+    <None Include="external\ASF\common\utils\interrupt\interrupt_avr8.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\xmega\osc.h">
+    <None Include="external\ASF\common\services\clock\xmega\osc.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\status_codes.h">
+    <None Include="external\ASF\xmega\utils\status_codes.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\utils\interrupt.h">
+    <None Include="external\ASF\common\utils\interrupt.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\genclk.h">
+    <None Include="external\ASF\common\services\clock\genclk.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\ioport\xmega\ioport.h">
+    <None Include="external\ASF\common\services\ioport\xmega\ioport.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\delay\xmega\cycle_counter.h">
+    <None Include="external\ASF\common\services\delay\xmega\cycle_counter.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\xmega\pll.h">
+    <None Include="external\ASF\common\services\clock\xmega\pll.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\delay\delay.h">
+    <None Include="external\ASF\common\services\delay\delay.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\utils\parts.h">
+    <None Include="external\ASF\common\utils\parts.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\sleepmgr\sleepmgr.h">
+    <None Include="external\ASF\common\services\sleepmgr\sleepmgr.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\drivers\rtc32\rtc32.h">
+    <None Include="external\ASF\xmega\drivers\rtc32\rtc32.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\ioport\xmega\ioport_compat.h">
+    <None Include="external\ASF\common\services\ioport\xmega\ioport_compat.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\xmega\sysclk.h">
+    <None Include="external\ASF\common\services\clock\xmega\sysclk.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\common\services\clock\osc.h">
+    <None Include="external\ASF\common\services\clock\osc.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\common\services\clock\xmega\sysclk.c">
+    <Compile Include="external\ASF\common\services\clock\xmega\sysclk.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\common\services\gpio\gpio.h">
+    <None Include="external\ASF\common\services\gpio\gpio.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="ASF\common\services\ioport\xmega\ioport_compat.c">
+    <Compile Include="external\ASF\common\services\ioport\xmega\ioport_compat.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\common\services\sleepmgr\xmega\sleepmgr.c">
+    <Compile Include="external\ASF\common\services\sleepmgr\xmega\sleepmgr.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\boards\xmega_a3bu_xplained\init.c">
+    <Compile Include="external\ASF\xmega\boards\xmega_a3bu_xplained\init.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\adc\adc.c">
+    <Compile Include="external\ASF\xmega\drivers\adc\adc.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\adc\xmega_aau\adc_aau.c">
+    <Compile Include="external\ASF\xmega\drivers\adc\xmega_aau\adc_aau.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\cpu\ccp.s">
+    <Compile Include="external\ASF\xmega\drivers\cpu\ccp.s">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\rtc32\rtc32.c">
+    <Compile Include="external\ASF\xmega\drivers\rtc32\rtc32.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="ASF\xmega\drivers\tc\tc.c">
+    <Compile Include="external\ASF\xmega\drivers\tc\tc.c">
       <SubType>compile</SubType>
     </Compile>
-    <None Include="ASF\xmega\utils\progmem.h">
+    <None Include="external\ASF\xmega\utils\progmem.h">
       <SubType>compile</SubType>
     </None>
-    <None Include="ASF\xmega\utils\preprocessor\tpaste.h">
+    <None Include="external\ASF\xmega\utils\preprocessor\tpaste.h">
       <SubType>compile</SubType>
     </None>
     <Compile Include="led.c">
diff --git a/ports/xplained/ASF/common/boards/board.h b/ports/xplained/external/ASF/common/boards/board.h
similarity index 100%
rename from ports/xplained/ASF/common/boards/board.h
rename to ports/xplained/external/ASF/common/boards/board.h
diff --git a/ports/xplained/ASF/common/drivers/nvm/common_nvm.h b/ports/xplained/external/ASF/common/drivers/nvm/common_nvm.h
similarity index 100%
rename from ports/xplained/ASF/common/drivers/nvm/common_nvm.h
rename to ports/xplained/external/ASF/common/drivers/nvm/common_nvm.h
diff --git a/ports/xplained/ASF/common/drivers/nvm/xmega/xmega_nvm.c b/ports/xplained/external/ASF/common/drivers/nvm/xmega/xmega_nvm.c
similarity index 100%
rename from ports/xplained/ASF/common/drivers/nvm/xmega/xmega_nvm.c
rename to ports/xplained/external/ASF/common/drivers/nvm/xmega/xmega_nvm.c
diff --git a/ports/xplained/ASF/common/services/clock/genclk.h b/ports/xplained/external/ASF/common/services/clock/genclk.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/genclk.h
rename to ports/xplained/external/ASF/common/services/clock/genclk.h
diff --git a/ports/xplained/ASF/common/services/clock/osc.h b/ports/xplained/external/ASF/common/services/clock/osc.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/osc.h
rename to ports/xplained/external/ASF/common/services/clock/osc.h
diff --git a/ports/xplained/ASF/common/services/clock/pll.h b/ports/xplained/external/ASF/common/services/clock/pll.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/pll.h
rename to ports/xplained/external/ASF/common/services/clock/pll.h
diff --git a/ports/xplained/ASF/common/services/clock/sysclk.h b/ports/xplained/external/ASF/common/services/clock/sysclk.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/sysclk.h
rename to ports/xplained/external/ASF/common/services/clock/sysclk.h
diff --git a/ports/xplained/ASF/common/services/clock/xmega/osc.h b/ports/xplained/external/ASF/common/services/clock/xmega/osc.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/xmega/osc.h
rename to ports/xplained/external/ASF/common/services/clock/xmega/osc.h
diff --git a/ports/xplained/ASF/common/services/clock/xmega/pll.h b/ports/xplained/external/ASF/common/services/clock/xmega/pll.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/xmega/pll.h
rename to ports/xplained/external/ASF/common/services/clock/xmega/pll.h
diff --git a/ports/xplained/ASF/common/services/clock/xmega/sysclk.c b/ports/xplained/external/ASF/common/services/clock/xmega/sysclk.c
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/xmega/sysclk.c
rename to ports/xplained/external/ASF/common/services/clock/xmega/sysclk.c
diff --git a/ports/xplained/ASF/common/services/clock/xmega/sysclk.h b/ports/xplained/external/ASF/common/services/clock/xmega/sysclk.h
similarity index 100%
rename from ports/xplained/ASF/common/services/clock/xmega/sysclk.h
rename to ports/xplained/external/ASF/common/services/clock/xmega/sysclk.h
diff --git a/ports/xplained/ASF/common/services/delay/delay.h b/ports/xplained/external/ASF/common/services/delay/delay.h
similarity index 100%
rename from ports/xplained/ASF/common/services/delay/delay.h
rename to ports/xplained/external/ASF/common/services/delay/delay.h
diff --git a/ports/xplained/ASF/common/services/delay/xmega/cycle_counter.h b/ports/xplained/external/ASF/common/services/delay/xmega/cycle_counter.h
similarity index 100%
rename from ports/xplained/ASF/common/services/delay/xmega/cycle_counter.h
rename to ports/xplained/external/ASF/common/services/delay/xmega/cycle_counter.h
diff --git a/ports/xplained/ASF/common/services/gpio/gpio.h b/ports/xplained/external/ASF/common/services/gpio/gpio.h
similarity index 100%
rename from ports/xplained/ASF/common/services/gpio/gpio.h
rename to ports/xplained/external/ASF/common/services/gpio/gpio.h
diff --git a/ports/xplained/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h b/ports/xplained/external/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h
similarity index 100%
rename from ports/xplained/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h
rename to ports/xplained/external/ASF/common/services/gpio/xmega_gpio/xmega_gpio.h
diff --git a/ports/xplained/ASF/common/services/ioport/ioport.h b/ports/xplained/external/ASF/common/services/ioport/ioport.h
similarity index 100%
rename from ports/xplained/ASF/common/services/ioport/ioport.h
rename to ports/xplained/external/ASF/common/services/ioport/ioport.h
diff --git a/ports/xplained/ASF/common/services/ioport/xmega/ioport.h b/ports/xplained/external/ASF/common/services/ioport/xmega/ioport.h
similarity index 100%
rename from ports/xplained/ASF/common/services/ioport/xmega/ioport.h
rename to ports/xplained/external/ASF/common/services/ioport/xmega/ioport.h
diff --git a/ports/xplained/ASF/common/services/ioport/xmega/ioport_compat.c b/ports/xplained/external/ASF/common/services/ioport/xmega/ioport_compat.c
similarity index 100%
rename from ports/xplained/ASF/common/services/ioport/xmega/ioport_compat.c
rename to ports/xplained/external/ASF/common/services/ioport/xmega/ioport_compat.c
diff --git a/ports/xplained/ASF/common/services/ioport/xmega/ioport_compat.h b/ports/xplained/external/ASF/common/services/ioport/xmega/ioport_compat.h
similarity index 100%
rename from ports/xplained/ASF/common/services/ioport/xmega/ioport_compat.h
rename to ports/xplained/external/ASF/common/services/ioport/xmega/ioport_compat.h
diff --git a/ports/xplained/ASF/common/services/serial/serial.h b/ports/xplained/external/ASF/common/services/serial/serial.h
similarity index 100%
rename from ports/xplained/ASF/common/services/serial/serial.h
rename to ports/xplained/external/ASF/common/services/serial/serial.h
diff --git a/ports/xplained/ASF/common/services/serial/usart_serial.c b/ports/xplained/external/ASF/common/services/serial/usart_serial.c
similarity index 100%
rename from ports/xplained/ASF/common/services/serial/usart_serial.c
rename to ports/xplained/external/ASF/common/services/serial/usart_serial.c
diff --git a/ports/xplained/ASF/common/services/serial/xmega_usart/usart_serial.h b/ports/xplained/external/ASF/common/services/serial/xmega_usart/usart_serial.h
similarity index 100%
rename from ports/xplained/ASF/common/services/serial/xmega_usart/usart_serial.h
rename to ports/xplained/external/ASF/common/services/serial/xmega_usart/usart_serial.h
diff --git a/ports/xplained/ASF/common/services/sleepmgr/sleepmgr.h b/ports/xplained/external/ASF/common/services/sleepmgr/sleepmgr.h
similarity index 100%
rename from ports/xplained/ASF/common/services/sleepmgr/sleepmgr.h
rename to ports/xplained/external/ASF/common/services/sleepmgr/sleepmgr.h
diff --git a/ports/xplained/ASF/common/services/sleepmgr/xmega/sleepmgr.c b/ports/xplained/external/ASF/common/services/sleepmgr/xmega/sleepmgr.c
similarity index 100%
rename from ports/xplained/ASF/common/services/sleepmgr/xmega/sleepmgr.c
rename to ports/xplained/external/ASF/common/services/sleepmgr/xmega/sleepmgr.c
diff --git a/ports/xplained/ASF/common/services/sleepmgr/xmega/sleepmgr.h b/ports/xplained/external/ASF/common/services/sleepmgr/xmega/sleepmgr.h
similarity index 100%
rename from ports/xplained/ASF/common/services/sleepmgr/xmega/sleepmgr.h
rename to ports/xplained/external/ASF/common/services/sleepmgr/xmega/sleepmgr.h
diff --git a/ports/xplained/ASF/common/utils/interrupt.h b/ports/xplained/external/ASF/common/utils/interrupt.h
similarity index 100%
rename from ports/xplained/ASF/common/utils/interrupt.h
rename to ports/xplained/external/ASF/common/utils/interrupt.h
diff --git a/ports/xplained/ASF/common/utils/interrupt/interrupt_avr8.h b/ports/xplained/external/ASF/common/utils/interrupt/interrupt_avr8.h
similarity index 100%
rename from ports/xplained/ASF/common/utils/interrupt/interrupt_avr8.h
rename to ports/xplained/external/ASF/common/utils/interrupt/interrupt_avr8.h
diff --git a/ports/xplained/ASF/common/utils/make/Makefile.avr.in b/ports/xplained/external/ASF/common/utils/make/Makefile.avr.in
similarity index 100%
rename from ports/xplained/ASF/common/utils/make/Makefile.avr.in
rename to ports/xplained/external/ASF/common/utils/make/Makefile.avr.in
diff --git a/ports/xplained/ASF/common/utils/parts.h b/ports/xplained/external/ASF/common/utils/parts.h
similarity index 100%
rename from ports/xplained/ASF/common/utils/parts.h
rename to ports/xplained/external/ASF/common/utils/parts.h
diff --git a/ports/xplained/ASF/common/utils/stdio/read.c b/ports/xplained/external/ASF/common/utils/stdio/read.c
similarity index 100%
rename from ports/xplained/ASF/common/utils/stdio/read.c
rename to ports/xplained/external/ASF/common/utils/stdio/read.c
diff --git a/ports/xplained/ASF/common/utils/stdio/stdio_serial/stdio_serial.h b/ports/xplained/external/ASF/common/utils/stdio/stdio_serial/stdio_serial.h
similarity index 100%
rename from ports/xplained/ASF/common/utils/stdio/stdio_serial/stdio_serial.h
rename to ports/xplained/external/ASF/common/utils/stdio/stdio_serial/stdio_serial.h
diff --git a/ports/xplained/ASF/common/utils/stdio/write.c b/ports/xplained/external/ASF/common/utils/stdio/write.c
similarity index 100%
rename from ports/xplained/ASF/common/utils/stdio/write.c
rename to ports/xplained/external/ASF/common/utils/stdio/write.c
diff --git a/ports/xplained/ASF/xmega/boards/xmega_a3bu_xplained/init.c b/ports/xplained/external/ASF/xmega/boards/xmega_a3bu_xplained/init.c
similarity index 100%
rename from ports/xplained/ASF/xmega/boards/xmega_a3bu_xplained/init.c
rename to ports/xplained/external/ASF/xmega/boards/xmega_a3bu_xplained/init.c
diff --git a/ports/xplained/ASF/xmega/boards/xmega_a3bu_xplained/led.h b/ports/xplained/external/ASF/xmega/boards/xmega_a3bu_xplained/led.h
similarity index 100%
rename from ports/xplained/ASF/xmega/boards/xmega_a3bu_xplained/led.h
rename to ports/xplained/external/ASF/xmega/boards/xmega_a3bu_xplained/led.h
diff --git a/ports/xplained/ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h b/ports/xplained/external/ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h
similarity index 100%
rename from ports/xplained/ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h
rename to ports/xplained/external/ASF/xmega/boards/xmega_a3bu_xplained/xmega_a3bu_xplained.h
diff --git a/ports/xplained/ASF/xmega/drivers/adc/adc.c b/ports/xplained/external/ASF/xmega/drivers/adc/adc.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/adc/adc.c
rename to ports/xplained/external/ASF/xmega/drivers/adc/adc.c
diff --git a/ports/xplained/ASF/xmega/drivers/adc/adc.h b/ports/xplained/external/ASF/xmega/drivers/adc/adc.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/adc/adc.h
rename to ports/xplained/external/ASF/xmega/drivers/adc/adc.h
diff --git a/ports/xplained/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c b/ports/xplained/external/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c
rename to ports/xplained/external/ASF/xmega/drivers/adc/xmega_aau/adc_aau.c
diff --git a/ports/xplained/ASF/xmega/drivers/cpu/ccp.S b/ports/xplained/external/ASF/xmega/drivers/cpu/ccp.S
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/cpu/ccp.S
rename to ports/xplained/external/ASF/xmega/drivers/cpu/ccp.S
diff --git a/ports/xplained/ASF/xmega/drivers/cpu/ccp.h b/ports/xplained/external/ASF/xmega/drivers/cpu/ccp.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/cpu/ccp.h
rename to ports/xplained/external/ASF/xmega/drivers/cpu/ccp.h
diff --git a/ports/xplained/ASF/xmega/drivers/cpu/xmega_reset_cause.h b/ports/xplained/external/ASF/xmega/drivers/cpu/xmega_reset_cause.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/cpu/xmega_reset_cause.h
rename to ports/xplained/external/ASF/xmega/drivers/cpu/xmega_reset_cause.h
diff --git a/ports/xplained/ASF/xmega/drivers/nvm/nvm.c b/ports/xplained/external/ASF/xmega/drivers/nvm/nvm.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/nvm/nvm.c
rename to ports/xplained/external/ASF/xmega/drivers/nvm/nvm.c
diff --git a/ports/xplained/ASF/xmega/drivers/nvm/nvm.h b/ports/xplained/external/ASF/xmega/drivers/nvm/nvm.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/nvm/nvm.h
rename to ports/xplained/external/ASF/xmega/drivers/nvm/nvm.h
diff --git a/ports/xplained/ASF/xmega/drivers/nvm/nvm_asm.S b/ports/xplained/external/ASF/xmega/drivers/nvm/nvm_asm.S
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/nvm/nvm_asm.S
rename to ports/xplained/external/ASF/xmega/drivers/nvm/nvm_asm.S
diff --git a/ports/xplained/ASF/xmega/drivers/pmic/pmic.h b/ports/xplained/external/ASF/xmega/drivers/pmic/pmic.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/pmic/pmic.h
rename to ports/xplained/external/ASF/xmega/drivers/pmic/pmic.h
diff --git a/ports/xplained/ASF/xmega/drivers/rtc32/rtc32.c b/ports/xplained/external/ASF/xmega/drivers/rtc32/rtc32.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/rtc32/rtc32.c
rename to ports/xplained/external/ASF/xmega/drivers/rtc32/rtc32.c
diff --git a/ports/xplained/ASF/xmega/drivers/rtc32/rtc32.h b/ports/xplained/external/ASF/xmega/drivers/rtc32/rtc32.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/rtc32/rtc32.h
rename to ports/xplained/external/ASF/xmega/drivers/rtc32/rtc32.h
diff --git a/ports/xplained/ASF/xmega/drivers/sleep/sleep.h b/ports/xplained/external/ASF/xmega/drivers/sleep/sleep.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/sleep/sleep.h
rename to ports/xplained/external/ASF/xmega/drivers/sleep/sleep.h
diff --git a/ports/xplained/ASF/xmega/drivers/tc/tc.c b/ports/xplained/external/ASF/xmega/drivers/tc/tc.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/tc/tc.c
rename to ports/xplained/external/ASF/xmega/drivers/tc/tc.c
diff --git a/ports/xplained/ASF/xmega/drivers/tc/tc.h b/ports/xplained/external/ASF/xmega/drivers/tc/tc.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/tc/tc.h
rename to ports/xplained/external/ASF/xmega/drivers/tc/tc.h
diff --git a/ports/xplained/ASF/xmega/drivers/twi/twi_common.h b/ports/xplained/external/ASF/xmega/drivers/twi/twi_common.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/twi/twi_common.h
rename to ports/xplained/external/ASF/xmega/drivers/twi/twi_common.h
diff --git a/ports/xplained/ASF/xmega/drivers/twi/twim.c b/ports/xplained/external/ASF/xmega/drivers/twi/twim.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/twi/twim.c
rename to ports/xplained/external/ASF/xmega/drivers/twi/twim.c
diff --git a/ports/xplained/ASF/xmega/drivers/twi/twim.h b/ports/xplained/external/ASF/xmega/drivers/twi/twim.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/twi/twim.h
rename to ports/xplained/external/ASF/xmega/drivers/twi/twim.h
diff --git a/ports/xplained/ASF/xmega/drivers/twi/twis.c b/ports/xplained/external/ASF/xmega/drivers/twi/twis.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/twi/twis.c
rename to ports/xplained/external/ASF/xmega/drivers/twi/twis.c
diff --git a/ports/xplained/ASF/xmega/drivers/twi/twis.h b/ports/xplained/external/ASF/xmega/drivers/twi/twis.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/twi/twis.h
rename to ports/xplained/external/ASF/xmega/drivers/twi/twis.h
diff --git a/ports/xplained/ASF/xmega/drivers/usart/usart.c b/ports/xplained/external/ASF/xmega/drivers/usart/usart.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/usart/usart.c
rename to ports/xplained/external/ASF/xmega/drivers/usart/usart.c
diff --git a/ports/xplained/ASF/xmega/drivers/usart/usart.h b/ports/xplained/external/ASF/xmega/drivers/usart/usart.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/usart/usart.h
rename to ports/xplained/external/ASF/xmega/drivers/usart/usart.h
diff --git a/ports/xplained/ASF/xmega/drivers/wdt/wdt.c b/ports/xplained/external/ASF/xmega/drivers/wdt/wdt.c
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/wdt/wdt.c
rename to ports/xplained/external/ASF/xmega/drivers/wdt/wdt.c
diff --git a/ports/xplained/ASF/xmega/drivers/wdt/wdt.h b/ports/xplained/external/ASF/xmega/drivers/wdt/wdt.h
similarity index 100%
rename from ports/xplained/ASF/xmega/drivers/wdt/wdt.h
rename to ports/xplained/external/ASF/xmega/drivers/wdt/wdt.h
diff --git a/ports/xplained/ASF/xmega/services/pwm/pwm.c b/ports/xplained/external/ASF/xmega/services/pwm/pwm.c
similarity index 100%
rename from ports/xplained/ASF/xmega/services/pwm/pwm.c
rename to ports/xplained/external/ASF/xmega/services/pwm/pwm.c
diff --git a/ports/xplained/ASF/xmega/services/pwm/pwm.h b/ports/xplained/external/ASF/xmega/services/pwm/pwm.h
similarity index 100%
rename from ports/xplained/ASF/xmega/services/pwm/pwm.h
rename to ports/xplained/external/ASF/xmega/services/pwm/pwm.h
diff --git a/ports/xplained/ASF/xmega/services/timeout/timeout.c b/ports/xplained/external/ASF/xmega/services/timeout/timeout.c
similarity index 100%
rename from ports/xplained/ASF/xmega/services/timeout/timeout.c
rename to ports/xplained/external/ASF/xmega/services/timeout/timeout.c
diff --git a/ports/xplained/ASF/xmega/services/timeout/timeout.h b/ports/xplained/external/ASF/xmega/services/timeout/timeout.h
similarity index 100%
rename from ports/xplained/ASF/xmega/services/timeout/timeout.h
rename to ports/xplained/external/ASF/xmega/services/timeout/timeout.h
diff --git a/ports/xplained/ASF/xmega/utils/assembler.h b/ports/xplained/external/ASF/xmega/utils/assembler.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/assembler.h
rename to ports/xplained/external/ASF/xmega/utils/assembler.h
diff --git a/ports/xplained/ASF/xmega/utils/assembler/gas.h b/ports/xplained/external/ASF/xmega/utils/assembler/gas.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/assembler/gas.h
rename to ports/xplained/external/ASF/xmega/utils/assembler/gas.h
diff --git a/ports/xplained/ASF/xmega/utils/bit_handling/clz_ctz.h b/ports/xplained/external/ASF/xmega/utils/bit_handling/clz_ctz.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/bit_handling/clz_ctz.h
rename to ports/xplained/external/ASF/xmega/utils/bit_handling/clz_ctz.h
diff --git a/ports/xplained/ASF/xmega/utils/compiler.h b/ports/xplained/external/ASF/xmega/utils/compiler.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/compiler.h
rename to ports/xplained/external/ASF/xmega/utils/compiler.h
diff --git a/ports/xplained/ASF/xmega/utils/preprocessor/mrepeat.h b/ports/xplained/external/ASF/xmega/utils/preprocessor/mrepeat.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/preprocessor/mrepeat.h
rename to ports/xplained/external/ASF/xmega/utils/preprocessor/mrepeat.h
diff --git a/ports/xplained/ASF/xmega/utils/preprocessor/preprocessor.h b/ports/xplained/external/ASF/xmega/utils/preprocessor/preprocessor.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/preprocessor/preprocessor.h
rename to ports/xplained/external/ASF/xmega/utils/preprocessor/preprocessor.h
diff --git a/ports/xplained/ASF/xmega/utils/preprocessor/stringz.h b/ports/xplained/external/ASF/xmega/utils/preprocessor/stringz.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/preprocessor/stringz.h
rename to ports/xplained/external/ASF/xmega/utils/preprocessor/stringz.h
diff --git a/ports/xplained/ASF/xmega/utils/preprocessor/tpaste.h b/ports/xplained/external/ASF/xmega/utils/preprocessor/tpaste.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/preprocessor/tpaste.h
rename to ports/xplained/external/ASF/xmega/utils/preprocessor/tpaste.h
diff --git a/ports/xplained/ASF/xmega/utils/progmem.h b/ports/xplained/external/ASF/xmega/utils/progmem.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/progmem.h
rename to ports/xplained/external/ASF/xmega/utils/progmem.h
diff --git a/ports/xplained/ASF/xmega/utils/status_codes.h b/ports/xplained/external/ASF/xmega/utils/status_codes.h
similarity index 100%
rename from ports/xplained/ASF/xmega/utils/status_codes.h
rename to ports/xplained/external/ASF/xmega/utils/status_codes.h
diff --git a/ports/xplained/config/conf_adc.h b/ports/xplained/external/config/conf_adc.h
similarity index 100%
rename from ports/xplained/config/conf_adc.h
rename to ports/xplained/external/config/conf_adc.h
diff --git a/ports/xplained/config/conf_board.h b/ports/xplained/external/config/conf_board.h
similarity index 100%
rename from ports/xplained/config/conf_board.h
rename to ports/xplained/external/config/conf_board.h
diff --git a/ports/xplained/config/conf_clock.h b/ports/xplained/external/config/conf_clock.h
similarity index 100%
rename from ports/xplained/config/conf_clock.h
rename to ports/xplained/external/config/conf_clock.h
diff --git a/ports/xplained/config/conf_nvm.h b/ports/xplained/external/config/conf_nvm.h
similarity index 100%
rename from ports/xplained/config/conf_nvm.h
rename to ports/xplained/external/config/conf_nvm.h
diff --git a/ports/xplained/config/conf_rtc32.h b/ports/xplained/external/config/conf_rtc32.h
similarity index 100%
rename from ports/xplained/config/conf_rtc32.h
rename to ports/xplained/external/config/conf_rtc32.h
diff --git a/ports/xplained/config/conf_sleepmgr.h b/ports/xplained/external/config/conf_sleepmgr.h
similarity index 100%
rename from ports/xplained/config/conf_sleepmgr.h
rename to ports/xplained/external/config/conf_sleepmgr.h
diff --git a/ports/xplained/config/conf_timeout.h b/ports/xplained/external/config/conf_timeout.h
similarity index 100%
rename from ports/xplained/config/conf_timeout.h
rename to ports/xplained/external/config/conf_timeout.h
diff --git a/ports/xplained/config/conf_twim.h b/ports/xplained/external/config/conf_twim.h
similarity index 100%
rename from ports/xplained/config/conf_twim.h
rename to ports/xplained/external/config/conf_twim.h
diff --git a/ports/xplained/config/conf_usart_serial.h b/ports/xplained/external/config/conf_usart_serial.h
similarity index 100%
rename from ports/xplained/config/conf_usart_serial.h
rename to ports/xplained/external/config/conf_usart_serial.h
diff --git a/ports/xplained/rs485-shield/rs485-shield.brd b/ports/xplained/external/rs485-shield/rs485-shield.brd
similarity index 100%
rename from ports/xplained/rs485-shield/rs485-shield.brd
rename to ports/xplained/external/rs485-shield/rs485-shield.brd
diff --git a/ports/xplained/rs485-shield/rs485-shield.sch b/ports/xplained/external/rs485-shield/rs485-shield.sch
similarity index 100%
rename from ports/xplained/rs485-shield/rs485-shield.sch
rename to ports/xplained/external/rs485-shield/rs485-shield.sch