diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd03b02..db9b717 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ list(APPEND INCLUDE_SDK_DIRS
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/bootloader"
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/fstorage"
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/experimental_section_vars"
-    "${SDK_DIRECTORY}/nRF5SDK/components/softdevice/s113/headers"
+    "${SDK_DIRECTORY}/nRF5SDK/components/softdevice"
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/mutex"
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/delay"
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/bootloader/ble_dfu"
@@ -89,7 +89,6 @@ endif()
 list(APPEND INCLUDE_SDK_DIRS
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/fds"
     "${SDK_DIRECTORY}/nRF5SDK/components/libraries/atomic_flags"
-    "${SDK_DIRECTORY}/nRF5SDK/components/softdevice/s113/headers/nrf52"
     "${SDK_DIRECTORY}/nRF5SDK/components/ble/ble_services/ble_dfu"
 )
 
diff --git a/nRF5SDK/components/softdevice/ble.h b/nRF5SDK/components/softdevice/ble.h
new file mode 100755
index 0000000..dc7da07
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_err.h b/nRF5SDK/components/softdevice/ble_err.h
new file mode 100755
index 0000000..c91d637
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_err.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_err.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_err.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_gap.h b/nRF5SDK/components/softdevice/ble_gap.h
new file mode 100755
index 0000000..200f660
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_gap.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_gap.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_gap.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_gatt.h b/nRF5SDK/components/softdevice/ble_gatt.h
new file mode 100755
index 0000000..f1ffea4
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_gatt.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_gatt.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_gatt.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_gattc.h b/nRF5SDK/components/softdevice/ble_gattc.h
new file mode 100755
index 0000000..aa62310
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_gattc.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_gattc.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_gattc.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_gatts.h b/nRF5SDK/components/softdevice/ble_gatts.h
new file mode 100755
index 0000000..777cab6
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_gatts.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_gatts.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_gatts.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_hci.h b/nRF5SDK/components/softdevice/ble_hci.h
new file mode 100755
index 0000000..d22442a
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_hci.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_hci.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_hci.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_l2cap.h b/nRF5SDK/components/softdevice/ble_l2cap.h
new file mode 100755
index 0000000..a33113c
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_l2cap.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_l2cap.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_l2cap.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_ranges.h b/nRF5SDK/components/softdevice/ble_ranges.h
new file mode 100755
index 0000000..aa330f0
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_ranges.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_ranges.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_ranges.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/ble_types.h b/nRF5SDK/components/softdevice/ble_types.h
new file mode 100755
index 0000000..b2cddd9
--- /dev/null
+++ b/nRF5SDK/components/softdevice/ble_types.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/ble_types.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/ble_types.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_error.h b/nRF5SDK/components/softdevice/nrf_error.h
new file mode 100755
index 0000000..55ecfd8
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_error.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_error.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_error.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_error_sdm.h b/nRF5SDK/components/softdevice/nrf_error_sdm.h
new file mode 100755
index 0000000..a367a9e
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_error_sdm.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_error_sdm.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_error_sdm.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_error_soc.h b/nRF5SDK/components/softdevice/nrf_error_soc.h
new file mode 100755
index 0000000..f1329d6
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_error_soc.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_error_soc.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_error_soc.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_mbr.h b/nRF5SDK/components/softdevice/nrf_mbr.h
new file mode 100755
index 0000000..8b8d2de
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_mbr.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf52/nrf_mbr.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf52/nrf_mbr.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_nvic.h b/nRF5SDK/components/softdevice/nrf_nvic.h
new file mode 100755
index 0000000..9188063
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_nvic.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_nvic.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_nvic.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_sd_def.h b/nRF5SDK/components/softdevice/nrf_sd_def.h
new file mode 100755
index 0000000..8e8ab81
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_sd_def.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_sd_def.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_sd_def.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_sdm.h b/nRF5SDK/components/softdevice/nrf_sdm.h
new file mode 100755
index 0000000..c3319ca
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_sdm.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_sdm.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_sdm.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_soc.h b/nRF5SDK/components/softdevice/nrf_soc.h
new file mode 100755
index 0000000..561fffc
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_soc.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_soc.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_soc.h"
+#endif
diff --git a/nRF5SDK/components/softdevice/nrf_svc.h b/nRF5SDK/components/softdevice/nrf_svc.h
new file mode 100755
index 0000000..60e7784
--- /dev/null
+++ b/nRF5SDK/components/softdevice/nrf_svc.h
@@ -0,0 +1,8 @@
+
+#ifdef S140
+#include "s140/headers/nrf_svc.h"
+#endif
+
+#ifdef S113
+#include "s113/headers/nrf_svc.h"
+#endif