diff --git a/.github/targets/nordic_pca10028_blehci/pkg.yml b/.github/targets/nordic_pca10028_blehci/pkg.yml
index a1365ea75..b3504c3d9 100644
--- a/.github/targets/nordic_pca10028_blehci/pkg.yml
+++ b/.github/targets/nordic_pca10028_blehci/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/blehci-nordic_pca10028
-pkg.name: "targets/nordic_pca10028_blehci"
+### Package: "targets_ci/blehci-nordic_pca10028
+pkg.name: "targets_ci/nordic_pca10028_blehci"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10028_boot/pkg.yml b/.github/targets/nordic_pca10028_boot/pkg.yml
index ab6ff0c91..6cf0c922e 100644
--- a/.github/targets/nordic_pca10028_boot/pkg.yml
+++ b/.github/targets/nordic_pca10028_boot/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10028_boot
-pkg.name: "targets/nordic_pca10028_boot"
+### Package: "targets_ci/nordic_pca10028_boot
+pkg.name: "targets_ci/nordic_pca10028_boot"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10028_bt5_blehci/pkg.yml b/.github/targets/nordic_pca10028_bt5_blehci/pkg.yml
index e7bd2e076..80774bfd4 100644
--- a/.github/targets/nordic_pca10028_bt5_blehci/pkg.yml
+++ b/.github/targets/nordic_pca10028_bt5_blehci/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10028_bt5_blehci
-pkg.name: "targets/nordic_pca10028_bt5_blehci"
+### Package: "targets_ci/nordic_pca10028_bt5_blehci
+pkg.name: "targets_ci/nordic_pca10028_bt5_blehci"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056-blehci-usb/pkg.yml b/.github/targets/nordic_pca10056-blehci-usb/pkg.yml
index 2c8307d3d..4f92d9b96 100644
--- a/.github/targets/nordic_pca10056-blehci-usb/pkg.yml
+++ b/.github/targets/nordic_pca10056-blehci-usb/pkg.yml
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056-blehci-usb"
+pkg.name: "targets_ci/nordic_pca10056-blehci-usb"
 pkg.type: target
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_advertiser/pkg.yml b/.github/targets/nordic_pca10056_advertiser/pkg.yml
index 84d0c05b3..6de3362b5 100644
--- a/.github/targets/nordic_pca10056_advertiser/pkg.yml
+++ b/.github/targets/nordic_pca10056_advertiser/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_advertiser"
+pkg.name: "targets_ci/nordic_pca10056_advertiser"
 pkg.type: "target"
 pkg.description:
 pkg.author:
diff --git a/.github/targets/nordic_pca10056_blecent/pkg.yml b/.github/targets/nordic_pca10056_blecent/pkg.yml
index d47c0544d..64dbe8b51 100644
--- a/.github/targets/nordic_pca10056_blecent/pkg.yml
+++ b/.github/targets/nordic_pca10056_blecent/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blecent"
+pkg.name: "targets_ci/nordic_pca10056_blecent"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blecsc/pkg.yml b/.github/targets/nordic_pca10056_blecsc/pkg.yml
index f26c7df69..65a125ca3 100644
--- a/.github/targets/nordic_pca10056_blecsc/pkg.yml
+++ b/.github/targets/nordic_pca10056_blecsc/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blecsc"
+pkg.name: "targets_ci/nordic_pca10056_blecsc"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blehci/pkg.yml b/.github/targets/nordic_pca10056_blehci/pkg.yml
index b66dab987..204f4a5f3 100644
--- a/.github/targets/nordic_pca10056_blehci/pkg.yml
+++ b/.github/targets/nordic_pca10056_blehci/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blehci"
+pkg.name: "targets_ci/nordic_pca10056_blehci"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blehci_all_enabled/pkg.yml b/.github/targets/nordic_pca10056_blehci_all_enabled/pkg.yml
index c44ac2824..6ede68c23 100644
--- a/.github/targets/nordic_pca10056_blehci_all_enabled/pkg.yml
+++ b/.github/targets/nordic_pca10056_blehci_all_enabled/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blehci_all_enabled"
+pkg.name: "targets_ci/nordic_pca10056_blehci_all_enabled"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blehci_no_privacy/pkg.yml b/.github/targets/nordic_pca10056_blehci_no_privacy/pkg.yml
index 539a36409..ed7e725dd 100644
--- a/.github/targets/nordic_pca10056_blehci_no_privacy/pkg.yml
+++ b/.github/targets/nordic_pca10056_blehci_no_privacy/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blehci_no_privacy"
+pkg.name: "targets_ci/nordic_pca10056_blehci_no_privacy"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blehr/pkg.yml b/.github/targets/nordic_pca10056_blehr/pkg.yml
index fd7e6fa90..aa37aa0e1 100644
--- a/.github/targets/nordic_pca10056_blehr/pkg.yml
+++ b/.github/targets/nordic_pca10056_blehr/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blehr"
+pkg.name: "targets_ci/nordic_pca10056_blehr"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh/pkg.yml b/.github/targets/nordic_pca10056_blemesh/pkg.yml
index b1785b01b..04f35835a 100644
--- a/.github/targets/nordic_pca10056_blemesh/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh"
+pkg.name: "targets_ci/nordic_pca10056_blemesh"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_cdb/pkg.yml b/.github/targets/nordic_pca10056_blemesh_cdb/pkg.yml
index 2a85a9881..1c059a402 100644
--- a/.github/targets/nordic_pca10056_blemesh_cdb/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_cdb/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_cdb"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_cdb"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_ext_adv/pkg.yml b/.github/targets/nordic_pca10056_blemesh_ext_adv/pkg.yml
index 3fec50f68..1f8c88d3b 100644
--- a/.github/targets/nordic_pca10056_blemesh_ext_adv/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_ext_adv/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_ext_adv"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_ext_adv"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_light/pkg.yml b/.github/targets/nordic_pca10056_blemesh_light/pkg.yml
index 991cccfd7..cfb98f674 100644
--- a/.github/targets/nordic_pca10056_blemesh_light/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_light/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_light"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_light"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_models_example_1/pkg.yml b/.github/targets/nordic_pca10056_blemesh_models_example_1/pkg.yml
index 38c54781a..68b8325b8 100644
--- a/.github/targets/nordic_pca10056_blemesh_models_example_1/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_models_example_1/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_models_example_1"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_models_example_1"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_models_example_2/pkg.yml b/.github/targets/nordic_pca10056_blemesh_models_example_2/pkg.yml
index b17b65258..2944216a5 100644
--- a/.github/targets/nordic_pca10056_blemesh_models_example_2/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_models_example_2/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_models_example_2"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_models_example_2"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_shell/pkg.yml b/.github/targets/nordic_pca10056_blemesh_shell/pkg.yml
index 4636feb41..e0bb36a94 100644
--- a/.github/targets/nordic_pca10056_blemesh_shell/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_shell/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_shell"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_shell"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blemesh_storage/pkg.yml b/.github/targets/nordic_pca10056_blemesh_storage/pkg.yml
index ff17acfcc..7a04e49ac 100644
--- a/.github/targets/nordic_pca10056_blemesh_storage/pkg.yml
+++ b/.github/targets/nordic_pca10056_blemesh_storage/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blemesh_storage"
+pkg.name: "targets_ci/nordic_pca10056_blemesh_storage"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_bleprph/pkg.yml b/.github/targets/nordic_pca10056_bleprph/pkg.yml
index d1e7b95ee..4beaa1fca 100644
--- a/.github/targets/nordic_pca10056_bleprph/pkg.yml
+++ b/.github/targets/nordic_pca10056_bleprph/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_bleprph"
+pkg.name: "targets_ci/nordic_pca10056_bleprph"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_bleprph_oic/pkg.yml b/.github/targets/nordic_pca10056_bleprph_oic/pkg.yml
index aef9c2eb2..2c2f231e5 100644
--- a/.github/targets/nordic_pca10056_bleprph_oic/pkg.yml
+++ b/.github/targets/nordic_pca10056_bleprph_oic/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_bleprph_oic"
+pkg.name: "targets_ci/nordic_pca10056_bleprph_oic"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_blesplit/pkg.yml b/.github/targets/nordic_pca10056_blesplit/pkg.yml
index 8781b07ae..d62ab79c4 100644
--- a/.github/targets/nordic_pca10056_blesplit/pkg.yml
+++ b/.github/targets/nordic_pca10056_blesplit/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_blesplit"
+pkg.name: "targets_ci/nordic_pca10056_blesplit"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_bleuart/pkg.yml b/.github/targets/nordic_pca10056_bleuart/pkg.yml
index f3f3ce922..0ae1073de 100644
--- a/.github/targets/nordic_pca10056_bleuart/pkg.yml
+++ b/.github/targets/nordic_pca10056_bleuart/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_bleuart"
+pkg.name: "targets_ci/nordic_pca10056_bleuart"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell/pkg.yml b/.github/targets/nordic_pca10056_btshell/pkg.yml
index 9049e0139..287ca4e3c 100644
--- a/.github/targets/nordic_pca10056_btshell/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_btshell
-pkg.name: "targets/nordic_pca10056_btshell"
+### Package: "targets_ci/nordic_pca10056_btshell
+pkg.name: "targets_ci/nordic_pca10056_btshell"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_2M/pkg.yml b/.github/targets/nordic_pca10056_btshell_2M/pkg.yml
index fc2db1d01..e55557564 100644
--- a/.github/targets/nordic_pca10056_btshell_2M/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_2M/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_2M"
+pkg.name: "targets_ci/nordic_pca10056_btshell_2M"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_2M_coded/pkg.yml b/.github/targets/nordic_pca10056_btshell_2M_coded/pkg.yml
index 0ddee925f..a0b8ad888 100644
--- a/.github/targets/nordic_pca10056_btshell_2M_coded/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_2M_coded/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_2M_coded"
+pkg.name: "targets_ci/nordic_pca10056_btshell_2M_coded"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_all/pkg.yml b/.github/targets/nordic_pca10056_btshell_all/pkg.yml
index 2a18f7030..5ac5cc77d 100644
--- a/.github/targets/nordic_pca10056_btshell_all/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_all/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_btshell_all
-pkg.name: "targets/nordic_pca10056_btshell_all"
+### Package: "targets_ci/nordic_pca10056_btshell_all
+pkg.name: "targets_ci/nordic_pca10056_btshell_all"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_all_v52/pkg.yml b/.github/targets/nordic_pca10056_btshell_all_v52/pkg.yml
index 14d5fc694..e218c511c 100644
--- a/.github/targets/nordic_pca10056_btshell_all_v52/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_all_v52/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_btshell_all_v52
-pkg.name: "targets/nordic_pca10056_btshell_all_v52"
+### Package: "targets_ci/nordic_pca10056_btshell_all_v52
+pkg.name: "targets_ci/nordic_pca10056_btshell_all_v52"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_coded/pkg.yml b/.github/targets/nordic_pca10056_btshell_coded/pkg.yml
index c3ec70a30..87a1eb64c 100644
--- a/.github/targets/nordic_pca10056_btshell_coded/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_coded/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_coded"
+pkg.name: "targets_ci/nordic_pca10056_btshell_coded"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_ext_adv/pkg.yml b/.github/targets/nordic_pca10056_btshell_ext_adv/pkg.yml
index c8cce2997..b39ebae19 100644
--- a/.github/targets/nordic_pca10056_btshell_ext_adv/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_ext_adv/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_ext_adv"
+pkg.name: "targets_ci/nordic_pca10056_btshell_ext_adv"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_periodic_adv/pkg.yml b/.github/targets/nordic_pca10056_btshell_periodic_adv/pkg.yml
index b4f519e24..3a3a7d1eb 100644
--- a/.github/targets/nordic_pca10056_btshell_periodic_adv/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_periodic_adv/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_periodic_adv"
+pkg.name: "targets_ci/nordic_pca10056_btshell_periodic_adv"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_sm_legacy/pkg.yml b/.github/targets/nordic_pca10056_btshell_sm_legacy/pkg.yml
index 4c3d331eb..79dbec444 100644
--- a/.github/targets/nordic_pca10056_btshell_sm_legacy/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_sm_legacy/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_sm_legacy"
+pkg.name: "targets_ci/nordic_pca10056_btshell_sm_legacy"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_sm_none/pkg.yml b/.github/targets/nordic_pca10056_btshell_sm_none/pkg.yml
index a8ccee1f4..1061c2fa8 100644
--- a/.github/targets/nordic_pca10056_btshell_sm_none/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_sm_none/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_sm_none"
+pkg.name: "targets_ci/nordic_pca10056_btshell_sm_none"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc/pkg.yml b/.github/targets/nordic_pca10056_btshell_sm_sc/pkg.yml
index 611096aa3..0de165394 100644
--- a/.github/targets/nordic_pca10056_btshell_sm_sc/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_sm_sc/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_sm_sc"
+pkg.name: "targets_ci/nordic_pca10056_btshell_sm_sc"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml b/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
index 3983ec0ca..e75836015 100644
--- a/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_sm_sc_legacy/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_btshell_sm_sc_legacy"
+pkg.name: "targets_ci/nordic_pca10056_btshell_sm_sc_legacy"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_btshell_xtal_settle_0/pkg.yml b/.github/targets/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
index 19a580e19..2dde3239c 100644
--- a/.github/targets/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
+++ b/.github/targets/nordic_pca10056_btshell_xtal_settle_0/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_btshell_xtal_settle_0
-pkg.name: "targets/nordic_pca10056_btshell_xtal_settle_0"
+### Package: "targets_ci/nordic_pca10056_btshell_xtal_settle_0
+pkg.name: "targets_ci/nordic_pca10056_btshell_xtal_settle_0"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_bttester/pkg.yml b/.github/targets/nordic_pca10056_bttester/pkg.yml
index d50d245c3..5f72b58da 100644
--- a/.github/targets/nordic_pca10056_bttester/pkg.yml
+++ b/.github/targets/nordic_pca10056_bttester/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_bttester
-pkg.name: "targets/nordic_pca10056_bttester"
+### Package: "targets_ci/nordic_pca10056_bttester
+pkg.name: "targets_ci/nordic_pca10056_bttester"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_ext_advertiser/pkg.yml b/.github/targets/nordic_pca10056_ext_advertiser/pkg.yml
index 7dee43574..7a196568e 100644
--- a/.github/targets/nordic_pca10056_ext_advertiser/pkg.yml
+++ b/.github/targets/nordic_pca10056_ext_advertiser/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_btshell
-pkg.name: "targets/nordic_pca10056_ext_advertiser"
+### Package: "targets_ci/nordic_pca10056_btshell
+pkg.name: "targets_ci/nordic_pca10056_ext_advertiser"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10056_scanner/pkg.yml b/.github/targets/nordic_pca10056_scanner/pkg.yml
index dfc3c8b01..04b210a87 100644
--- a/.github/targets/nordic_pca10056_scanner/pkg.yml
+++ b/.github/targets/nordic_pca10056_scanner/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: "targets/nordic_pca10056_scanner"
+pkg.name: "targets_ci/nordic_pca10056_scanner"
 pkg.type: "target"
 pkg.description:
 pkg.author:
diff --git a/.github/targets/nordic_pca10095_blehci/pkg.yml b/.github/targets/nordic_pca10095_blehci/pkg.yml
index 04841c947..2cb827ecb 100644
--- a/.github/targets/nordic_pca10095_blehci/pkg.yml
+++ b/.github/targets/nordic_pca10095_blehci/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/blehci-nordic_pca10095
-pkg.name: "targets/nordic_pca10095_blehci"
+### Package: "targets_ci/blehci-nordic_pca10095
+pkg.name: "targets_ci/nordic_pca10095_blehci"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets/nordic_pca10095_btshell/pkg.yml b/.github/targets/nordic_pca10095_btshell/pkg.yml
index cfcc43dff..889405d34 100644
--- a/.github/targets/nordic_pca10095_btshell/pkg.yml
+++ b/.github/targets/nordic_pca10095_btshell/pkg.yml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-### Package: targets/nordic_pca10056_btshell
-pkg.name: "targets/nordic_pca10095_btshell"
+### Package: "targets_ci/nordic_pca10056_btshell
+pkg.name: "targets_ci/nordic_pca10095_btshell"
 pkg.type: "target"
 pkg.description: 
 pkg.author: 
diff --git a/.github/targets_native/native_btshell/pkg.yml b/.github/targets_native/native_btshell/pkg.yml
index a25252553..870ccae9c 100644
--- a/.github/targets_native/native_btshell/pkg.yml
+++ b/.github/targets_native/native_btshell/pkg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-pkg.name: targets/native_btshell
+pkg.name: targets_ci/native_btshell
 pkg.type: target
 pkg.description: 
 pkg.author: 
diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
index 16ea8aac6..c14f8da18 100644
--- a/.github/workflows/build_targets.yml
+++ b/.github/workflows/build_targets.yml
@@ -57,12 +57,12 @@ jobs:
       - name: Build targets
         shell: bash
         run: |
-             cp -r .github/targets ci_targets
-             ls ci_targets | xargs -n1 sh -c 'echo "Testing $0"; newt build -q $0'
-             rm -rf ci_targets
+             cp -r .github/targets targets_ci
+             ls targets_ci | xargs -n1 sh -c 'echo "Testing $0"; newt build -q targets_ci/$0'
+             rm -rf targets_ci
       - name: Build native targets
         if: matrix.os == 'ubuntu-latest'
         run: |
-             cp -r .github/targets_native ci_targets
-             ls ci_targets | xargs -n1 sh -c 'echo "Testing $0"; newt build -q $0'
-             rm -rf ci_targets
+             cp -r .github/targets_native targets_ci
+             ls targets_ci | xargs -n1 sh -c 'echo "Testing $0"; newt build -q  targets_ci/$0'
+             rm -rf targets_ci
diff --git a/.github/targets/dialog_cmac/pkg.yml b/targets/dialog_cmac/pkg.yml
similarity index 100%
rename from .github/targets/dialog_cmac/pkg.yml
rename to targets/dialog_cmac/pkg.yml
diff --git a/.github/targets/dialog_cmac/syscfg.yml b/targets/dialog_cmac/syscfg.yml
similarity index 100%
rename from .github/targets/dialog_cmac/syscfg.yml
rename to targets/dialog_cmac/syscfg.yml
diff --git a/.github/targets/dialog_cmac/target.yml b/targets/dialog_cmac/target.yml
similarity index 100%
rename from .github/targets/dialog_cmac/target.yml
rename to targets/dialog_cmac/target.yml
diff --git a/targets/nordic_pca10056-blehci-usb/pkg.yml b/targets/nordic_pca10056-blehci-usb/pkg.yml
new file mode 100644
index 000000000..2c8307d3d
--- /dev/null
+++ b/targets/nordic_pca10056-blehci-usb/pkg.yml
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: "targets/nordic_pca10056-blehci-usb"
+pkg.type: target
+pkg.description: 
+pkg.author: 
+pkg.homepage:
+
+pkg.deps:
+    - "@apache-mynewt-core/hw/usb/tinyusb"
+    - "@apache-mynewt-core/hw/usb/tinyusb/std_descriptors"
diff --git a/targets/nordic_pca10056-blehci-usb/syscfg.yml b/targets/nordic_pca10056-blehci-usb/syscfg.yml
new file mode 100644
index 000000000..0c5701a98
--- /dev/null
+++ b/targets/nordic_pca10056-blehci-usb/syscfg.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.vals:
+    BLE_TRANSPORT_HS: usb
+    USBD_BTH: 1
+
+    USBD_PID: 0xC01A
+    USBD_VID: 0xC0CA
diff --git a/targets/nordic_pca10056-blehci-usb/target.yml b/targets/nordic_pca10056-blehci-usb/target.yml
new file mode 100644
index 000000000..ce455d45c
--- /dev/null
+++ b/targets/nordic_pca10056-blehci-usb/target.yml
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+target.app: "@apache-mynewt-nimble/apps/blehci"
+target.bsp: "@apache-mynewt-core/hw/bsp/nordic_pca10056"
+target.build_profile: debug
diff --git a/.github/targets/nordic_pca10095_net-blehci/pkg.yml b/targets/nordic_pca10095_net-blehci/pkg.yml
similarity index 100%
rename from .github/targets/nordic_pca10095_net-blehci/pkg.yml
rename to targets/nordic_pca10095_net-blehci/pkg.yml
diff --git a/.github/targets/nordic_pca10095_net-blehci/syscfg.yml b/targets/nordic_pca10095_net-blehci/syscfg.yml
similarity index 100%
rename from .github/targets/nordic_pca10095_net-blehci/syscfg.yml
rename to targets/nordic_pca10095_net-blehci/syscfg.yml
diff --git a/.github/targets/nordic_pca10095_net-blehci/target.yml b/targets/nordic_pca10095_net-blehci/target.yml
similarity index 100%
rename from .github/targets/nordic_pca10095_net-blehci/target.yml
rename to targets/nordic_pca10095_net-blehci/target.yml