diff --git a/cw1_template/pca10059/mbr/arm4/usbd_cdc_acm_pca10056.uvopt b/cw1_template/pca10059/s140/arm4/usbd_cdc_acm_pca10056.uvopt
similarity index 97%
rename from cw1_template/pca10059/mbr/arm4/usbd_cdc_acm_pca10056.uvopt
rename to cw1_template/pca10059/s140/arm4/usbd_cdc_acm_pca10056.uvopt
index 7bac8a4722fb14f2752226e89a3779355908315a..6790765c7105884d9bcd7c108a335405312ee1b2 100644
--- a/cw1_template/pca10059/mbr/arm4/usbd_cdc_acm_pca10056.uvopt
+++ b/cw1_template/pca10059/s140/arm4/usbd_cdc_acm_pca10056.uvopt
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_opt.xsd">
-
- <SchemaVersion>1.0</SchemaVersion>
-
- <Header>### uVision Project, (C) Keil Software</Header>
- <Target>
- <TargetName>nrf52840_xxaa</TargetName>
- <ToolsetNumber>0x4</ToolsetNumber>
- <ToolsetName>ARM-ADS</ToolsetName>
- <TargetOption> <OPTFL>
- <IsCurrentTarget>1</IsCurrentTarget>
- </OPTFL> <DebugOpt>
- <pMon>Segger\JL2CM3.dll</pMon>
- </DebugOpt>
- <TargetDriverDllRegistry>
- <SetRegEntry>
- <Number>0</Number>
- <Key>JL2CM3</Key>
- <Name>-O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC2000 -FN1 -FF0nrf52xxx -FS00 -FL0200000 -FF1nrf52xxx_uicr.flm -FS110001000 -FL11000</Name>
- </SetRegEntry>
- <SetRegEntry>
- <Number>0</Number>
- <Key>UL2CM3</Key>
- <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0nrf52xxx -FS00 -FL0200000)</Name>
- </SetRegEntry>
- </TargetDriverDllRegistry>
- </TargetOption>
- </Target></ProjectOpt>
-
-
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_opt.xsd">
+
+ <SchemaVersion>1.0</SchemaVersion>
+
+ <Header>### uVision Project, (C) Keil Software</Header>
+ <Target>
+ <TargetName>nrf52840_xxaa</TargetName>
+ <ToolsetNumber>0x4</ToolsetNumber>
+ <ToolsetName>ARM-ADS</ToolsetName>
+ <TargetOption> <OPTFL>
+ <IsCurrentTarget>1</IsCurrentTarget>
+ </OPTFL> <DebugOpt>
+ <pMon>Segger\JL2CM3.dll</pMon>
+ </DebugOpt>
+ <TargetDriverDllRegistry>
+ <SetRegEntry>
+ <Number>0</Number>
+ <Key>JL2CM3</Key>
+ <Name>-O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC2000 -FN1 -FF0nrf52xxx -FS00 -FL0200000 -FF1nrf52xxx_uicr.flm -FS110001000 -FL11000</Name>
+ </SetRegEntry>
+ <SetRegEntry>
+ <Number>0</Number>
+ <Key>UL2CM3</Key>
+ <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0nrf52xxx -FS00 -FL0200000)</Name>
+ </SetRegEntry>
+ </TargetDriverDllRegistry>
+ </TargetOption>
+ </Target></ProjectOpt>
+
+
diff --git a/cw1_template/pca10059/mbr/arm4/usbd_cdc_acm_pca10056.uvproj b/cw1_template/pca10059/s140/arm4/usbd_cdc_acm_pca10056.uvproj
similarity index 100%
rename from cw1_template/pca10059/mbr/arm4/usbd_cdc_acm_pca10056.uvproj
rename to cw1_template/pca10059/s140/arm4/usbd_cdc_acm_pca10056.uvproj
diff --git a/cw1_template/pca10059/mbr/arm5_no_packs/usbd_cdc_acm_pca10056.uvoptx b/cw1_template/pca10059/s140/arm5_no_packs/usbd_cdc_acm_pca10056.uvoptx
similarity index 100%
rename from cw1_template/pca10059/mbr/arm5_no_packs/usbd_cdc_acm_pca10056.uvoptx
rename to cw1_template/pca10059/s140/arm5_no_packs/usbd_cdc_acm_pca10056.uvoptx
diff --git a/cw1_template/pca10059/mbr/arm5_no_packs/usbd_cdc_acm_pca10056.uvprojx b/cw1_template/pca10059/s140/arm5_no_packs/usbd_cdc_acm_pca10056.uvprojx
similarity index 100%
rename from cw1_template/pca10059/mbr/arm5_no_packs/usbd_cdc_acm_pca10056.uvprojx
rename to cw1_template/pca10059/s140/arm5_no_packs/usbd_cdc_acm_pca10056.uvprojx
diff --git a/cw1_template/pca10059/mbr/armgcc/Makefile b/cw1_template/pca10059/s140/armgcc/Makefile
similarity index 100%
rename from cw1_template/pca10059/mbr/armgcc/Makefile
rename to cw1_template/pca10059/s140/armgcc/Makefile
diff --git a/cw1_template/pca10059/mbr/armgcc/_build/nrf52840_xxaa.bin b/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin
similarity index 100%
rename from cw1_template/pca10059/mbr/armgcc/_build/nrf52840_xxaa.bin
rename to cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin
diff --git a/cw1_template/pca10059/mbr/armgcc/_build/nrf52840_xxaa.in b/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
similarity index 100%
rename from cw1_template/pca10059/mbr/armgcc/_build/nrf52840_xxaa.in
rename to cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
diff --git a/cw1_template/pca10059/mbr/armgcc/dfu.zip b/cw1_template/pca10059/s140/armgcc/dfu.zip
similarity index 100%
rename from cw1_template/pca10059/mbr/armgcc/dfu.zip
rename to cw1_template/pca10059/s140/armgcc/dfu.zip
diff --git a/cw1_template/pca10059/mbr/armgcc/usbd_cdc_acm_gcc_nrf52.ld b/cw1_template/pca10059/s140/armgcc/usbd_cdc_acm_gcc_nrf52.ld
similarity index 100%
rename from cw1_template/pca10059/mbr/armgcc/usbd_cdc_acm_gcc_nrf52.ld
rename to cw1_template/pca10059/s140/armgcc/usbd_cdc_acm_gcc_nrf52.ld
diff --git a/cw1_template/pca10059/mbr/config/sdk_config.h b/cw1_template/pca10059/s140/config/sdk_config.h
similarity index 100%
rename from cw1_template/pca10059/mbr/config/sdk_config.h
rename to cw1_template/pca10059/s140/config/sdk_config.h
diff --git a/cw1_template/pca10059/mbr/iar/usbd_cdc_acm_iar_nRF5x.icf b/cw1_template/pca10059/s140/iar/usbd_cdc_acm_iar_nRF5x.icf
similarity index 100%
rename from cw1_template/pca10059/mbr/iar/usbd_cdc_acm_iar_nRF5x.icf
rename to cw1_template/pca10059/s140/iar/usbd_cdc_acm_iar_nRF5x.icf
diff --git a/cw1_template/pca10059/mbr/iar/usbd_cdc_acm_pca10056.ewd b/cw1_template/pca10059/s140/iar/usbd_cdc_acm_pca10056.ewd
similarity index 100%
rename from cw1_template/pca10059/mbr/iar/usbd_cdc_acm_pca10056.ewd
rename to cw1_template/pca10059/s140/iar/usbd_cdc_acm_pca10056.ewd
diff --git a/cw1_template/pca10059/mbr/iar/usbd_cdc_acm_pca10056.ewp b/cw1_template/pca10059/s140/iar/usbd_cdc_acm_pca10056.ewp
similarity index 100%
rename from cw1_template/pca10059/mbr/iar/usbd_cdc_acm_pca10056.ewp
rename to cw1_template/pca10059/s140/iar/usbd_cdc_acm_pca10056.ewp
diff --git a/cw1_template/pca10059/mbr/ses/flash_placement.xml b/cw1_template/pca10059/s140/ses/flash_placement.xml
similarity index 100%
rename from cw1_template/pca10059/mbr/ses/flash_placement.xml
rename to cw1_template/pca10059/s140/ses/flash_placement.xml
diff --git a/cw1_template/pca10059/mbr/ses/usbd_cdc_acm_pca10056.emProject b/cw1_template/pca10059/s140/ses/usbd_cdc_acm_pca10056.emProject
similarity index 100%
rename from cw1_template/pca10059/mbr/ses/usbd_cdc_acm_pca10056.emProject
rename to cw1_template/pca10059/s140/ses/usbd_cdc_acm_pca10056.emProject
diff --git a/cw1_template/pca10059/mbr/ses/usbd_cdc_acm_pca10056.emSession b/cw1_template/pca10059/s140/ses/usbd_cdc_acm_pca10056.emSession
similarity index 100%
rename from cw1_template/pca10059/mbr/ses/usbd_cdc_acm_pca10056.emSession
rename to cw1_template/pca10059/s140/ses/usbd_cdc_acm_pca10056.emSession
diff --git a/cw1_template/pca10059/mbr/ses/usbd_cdc_acm_pca10056_Release.jlink b/cw1_template/pca10059/s140/ses/usbd_cdc_acm_pca10056_Release.jlink
similarity index 100%
rename from cw1_template/pca10059/mbr/ses/usbd_cdc_acm_pca10056_Release.jlink
rename to cw1_template/pca10059/s140/ses/usbd_cdc_acm_pca10056_Release.jlink