diff --git a/tools/test/bin/onos-app b/tools/dev/bin/onos-app
similarity index 100%
rename from tools/test/bin/onos-app
rename to tools/dev/bin/onos-app
diff --git a/tools/dev/bin/onos-create-app b/tools/dev/bin/onos-create-app
new file mode 100755
index 0000000..9546b1d
--- /dev/null
+++ b/tools/dev/bin/onos-create-app
@@ -0,0 +1,26 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Tool to create an application from scratch using ONOS Maven archetypes.
+# -----------------------------------------------------------------------------
+
+[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+. $ONOS_ROOT/tools/build/envDefaults
+
+type=${1:-bundle}
+
+if [ "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]; then
+    echo "usage: $(basename $0) {bundle|ui|cli|api} groupId artifactId version package mvn-options"
+    echo "        All arguments are optional"
+    exit 1
+fi
+
+otherOptions=""
+[ -n "$1" ] && shift
+[ -n "$1" ] && otherOptions="$otherOptions -DgroupId=$1" && shift
+[ -n "$1" ] && otherOptions="$otherOptions -DartifactId=$1" && shift
+[ -n "$1" ] && otherOptions="$otherOptions -Dversion=$1" && shift
+[ -n "$1" ] && otherOptions="$otherOptions -Dpackage=$1" && shift
+
+mvn archetype:generate -DarchetypeGroupId=org.onosproject \
+    -DarchetypeArtifactId=onos-$type-archetype -DarchetypeVersion=$ONOS_POM_VERSION \
+    $otherOptions "$@"
\ No newline at end of file
diff --git a/tools/test/bin/onos-karaf b/tools/dev/bin/onos-karaf
similarity index 100%
rename from tools/test/bin/onos-karaf
rename to tools/dev/bin/onos-karaf
diff --git a/tools/test/bin/onos-setup-karaf b/tools/dev/bin/onos-setup-karaf
similarity index 100%
rename from tools/test/bin/onos-setup-karaf
rename to tools/dev/bin/onos-setup-karaf
diff --git a/tools/test/bin/onos-update-bundle b/tools/dev/bin/onos-update-bundle
similarity index 100%
rename from tools/test/bin/onos-update-bundle
rename to tools/dev/bin/onos-update-bundle