diff --git a/features/nanostack/FEATURE_NANOSTACK/CONTRIBUTING.md b/features/nanostack/CONTRIBUTING.md
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/CONTRIBUTING.md
rename to features/nanostack/CONTRIBUTING.md
diff --git a/features/nanostack/FEATURE_NANOSTACK/clone_nanostack.sh b/features/nanostack/FEATURE_NANOSTACK/clone_nanostack.sh
index 7e67195c6a..79eed7479f 100755
--- a/features/nanostack/FEATURE_NANOSTACK/clone_nanostack.sh
+++ b/features/nanostack/FEATURE_NANOSTACK/clone_nanostack.sh
@@ -58,6 +58,7 @@ clean() {
         rm -rf $dir
     done
     clean_nanostack_binaries
+    clean_nanostack_licenses
 }
 
 clone() {
@@ -80,12 +81,23 @@ export_repos() {
 }
 
 copy_nanostack_binaries() {
-    mkdir -p ../nanostack-binaries
-    mv sal-stack-nanostack/FEATURE_* ../nanostack-binaries/
+    mv sal-stack-nanostack/FEATURE_* ../
 }
 
 clean_nanostack_binaries() {
-    rm -rf ../nanostack-binaries
+    for binaries in ../FEATURE_*; do
+        if [ "$binaries" != "../FEATURE_NANOSTACK" ]; then
+            rm -rf $binaries        
+        fi
+    done
+}
+
+copy_nanostack_licenses() {
+    mv sal-stack-nanostack/LICENSE* ../
+}
+
+clean_nanostack_licenses() {
+    rm -rf ../LICENSE*
 }
 
 case "${1-}" in
@@ -99,6 +111,7 @@ case "${1-}" in
     export)
         export_repos
         copy_nanostack_binaries
+        copy_nanostack_licenses
         ;;
     *)
         print_usage
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE b/features/nanostack/LICENSE
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE
rename to features/nanostack/LICENSE
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt b/features/nanostack/LICENSE-permissive-binary-license-1.0.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt
rename to features/nanostack/LICENSE-permissive-binary-license-1.0.txt