diff --git a/packages/cli/src/plugins/index.js b/packages/cli/src/plugins/index.js
index 714187df56..bc105ed77b 100644
--- a/packages/cli/src/plugins/index.js
+++ b/packages/cli/src/plugins/index.js
@@ -7,7 +7,7 @@ const { PLUGIN_TYPE_ARR } = require("@budibase/types")
 const { validate } = require("@budibase/backend-core/plugins")
 const { runPkgCommand } = require("../exec")
 const { join } = require("path")
-const { success, error, info } = require("../utils")
+const { success, error, info, moveDirectory } = require("../utils")
 
 function checkInPlugin() {
   if (!fs.existsSync("package.json")) {
@@ -45,13 +45,28 @@ async function init(opts) {
     `An amazing Budibase ${type}!`
   )
   const version = await questions.string("Version", "1.0.0")
+  console.log(
+    info(`By default the plugin will be created in the directory "${name}"`)
+  )
+  console.log(
+    info(
+      "if you are already in an empty directory, such as a new Git repo, you can disable this functionality."
+    )
+  )
+  const topLevel = await questions.confirmation("Create top level directory?")
   // get the skeleton
   console.log(info("Retrieving project..."))
   await getSkeleton(type, name)
   await fleshOutSkeleton(type, name, desc, version)
   console.log(info("Installing dependencies..."))
   await runPkgCommand("install", join(process.cwd(), name))
-  console.log(info(`Plugin created in directory "${name}"`))
+  // if no parent directory desired move to cwd
+  if (!topLevel) {
+    moveDirectory(name, process.cwd())
+    console.log(info(`Plugin created in current directory.`))
+  } else {
+    console.log(info(`Plugin created in directory "${name}"`))
+  }
 }
 
 async function verify() {
diff --git a/packages/cli/src/utils.js b/packages/cli/src/utils.js
index 818153ef02..81520708d8 100644
--- a/packages/cli/src/utils.js
+++ b/packages/cli/src/utils.js
@@ -3,6 +3,7 @@ const fs = require("fs")
 const axios = require("axios")
 const path = require("path")
 const progress = require("cli-progress")
+const { join } = require("path")
 
 exports.downloadFile = async (url, filePath) => {
   filePath = path.resolve(filePath)
@@ -67,3 +68,19 @@ exports.progressBar = total => {
 exports.checkSlashesInUrl = url => {
   return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2")
 }
+
+exports.moveDirectory = (oldPath, newPath) => {
+  const files = fs.readdirSync(oldPath)
+  // check any file exists already
+  for (let file of files) {
+    if (fs.existsSync(file)) {
+      throw new Error(
+        "Unable to remove top level directory - some skeleton files already exist."
+      )
+    }
+  }
+  for (let file of files) {
+    fs.renameSync(join(oldPath, file), join(newPath, file))
+  }
+  fs.rmdirSync(oldPath)
+}