diff --git a/cli/tauri.js/entry.js b/cli/tauri.js/entry.js
index a58e0469e..90eeb1209 100644
--- a/cli/tauri.js/entry.js
+++ b/cli/tauri.js/entry.js
@@ -3,8 +3,7 @@ const { readFileSync, writeFileSync, ensureDir } = require('fs-extra')
 const path = require('path')
 
 module.exports.generate = (outDir, cfg) => {
-  // this MUST be from the templates repo
-  const apiTemplate = readFileSync(path.resolve(__dirname, '../lib/tauri.js'), 'utf-8')
+  const apiTemplate = readFileSync(path.resolve(__dirname, './templates/tauri.js'), 'utf-8')
   const apiContent = compileTemplate(apiTemplate)({
     ...cfg,
     confName: 'tauri.conf.js'
diff --git a/cli/tauri.js/package.json b/cli/tauri.js/package.json
index 30e471a56..a9dd0ebf3 100644
--- a/cli/tauri.js/package.json
+++ b/cli/tauri.js/package.json
@@ -1,9 +1,9 @@
 {
   "name": "tauri",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Multi-binding collection of libraries and templates for building Tauri apps",
   "bin": {
-    "tauri": "./mode/bin/tauri.js"
+    "tauri": "./bin/tauri.js"
   },
   "funding": {
     "type": "opencollective",
@@ -27,7 +27,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">= 10.16.3",
+    "node": ">= 10.17.0",
     "npm": ">= 6.6.0",
     "yarn": ">= 1.19.1"
   },
diff --git a/cli/tauri.js/tauri.conf.js b/cli/tauri.js/tauri.conf.js
new file mode 100644
index 000000000..5d0d63f4c
--- /dev/null
+++ b/cli/tauri.js/tauri.conf.js
@@ -0,0 +1,33 @@
+const path = require('path')
+const distDir = path.resolve(__dirname, './dist')
+
+module.exports = function () {
+  return {
+    automaticStart: {
+      active: true
+    },
+    build: {
+      distDir: distDir,
+      devPath: 'http://localhost:4000' // devServer URL or path to html file
+    },
+    ctx: {},
+    tauri: {
+      embeddedServer: {
+        active: true
+      },
+      bundle: {
+        active: true
+      },
+      whitelist: {
+        all: false
+      },
+      window: {
+        title: 'Tauri App'
+      },
+      security: {
+        csp: 'default-src data: filesystem: ws: http: https: \'unsafe-eval\' \'unsafe-inline\''
+      }
+    },
+    edge: true
+  }
+}
diff --git a/cli/tauri.js/template.js b/cli/tauri.js/template.js
index 4baf2d92e..817cf5bd3 100644
--- a/cli/tauri.js/template.js
+++ b/cli/tauri.js/template.js
@@ -14,7 +14,7 @@ const injectConfFile = (injectPath, force, logging, directory) => {
   } else {
     try {
       removeSync(path)
-      copySync(resolve(__dirname, '../templates/conf/tauri.conf.js'), path)
+      copySync(resolve(__dirname, './templates/tauri.conf.js'), path)
     } catch (e) {
       if (logging) console.log(e)
       return false
@@ -33,7 +33,7 @@ Run \`tauri init --force template\` to overwrite.`)
   try {
     removeSync(injectPath)
     mkdirSync(injectPath)
-    copySync(resolve(__dirname, '../templates/rust'), injectPath)
+    copySync(resolve(__dirname, './templates/rust'), injectPath)
   } catch (e) {
     if (logging) console.log(e)
     return false
diff --git a/cli/tauri.js/templates/src-tauri/Cargo.toml b/cli/tauri.js/templates/rust/src-tauri/Cargo.toml
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/Cargo.toml
rename to cli/tauri.js/templates/rust/src-tauri/Cargo.toml
diff --git a/cli/tauri.js/templates/src-tauri/_gitignore b/cli/tauri.js/templates/rust/src-tauri/_gitignore
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/_gitignore
rename to cli/tauri.js/templates/rust/src-tauri/_gitignore
diff --git a/cli/tauri.js/templates/src-tauri/icons/128x128.png b/cli/tauri.js/templates/rust/src-tauri/icons/128x128.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/128x128.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/128x128.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/128x128@2x.png b/cli/tauri.js/templates/rust/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/128x128@2x.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/128x128@2x.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/32x32.png b/cli/tauri.js/templates/rust/src-tauri/icons/32x32.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/32x32.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/32x32.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square107x107Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square107x107Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square107x107Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square107x107Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square142x142Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square142x142Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square142x142Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square142x142Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square150x150Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square150x150Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square150x150Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square150x150Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square284x284Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square284x284Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square284x284Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square284x284Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square30x30Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square30x30Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square30x30Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square30x30Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square310x310Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square310x310Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square310x310Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square310x310Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square44x44Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square44x44Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square44x44Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square44x44Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square71x71Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square71x71Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square71x71Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square71x71Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/Square89x89Logo.png b/cli/tauri.js/templates/rust/src-tauri/icons/Square89x89Logo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/Square89x89Logo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/Square89x89Logo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/StoreLogo.png b/cli/tauri.js/templates/rust/src-tauri/icons/StoreLogo.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/StoreLogo.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/StoreLogo.png
diff --git a/cli/tauri.js/templates/src-tauri/icons/icon.icns b/cli/tauri.js/templates/rust/src-tauri/icons/icon.icns
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/icon.icns
rename to cli/tauri.js/templates/rust/src-tauri/icons/icon.icns
diff --git a/cli/tauri.js/templates/src-tauri/icons/icon.ico b/cli/tauri.js/templates/rust/src-tauri/icons/icon.ico
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/icon.ico
rename to cli/tauri.js/templates/rust/src-tauri/icons/icon.ico
diff --git a/cli/tauri.js/templates/src-tauri/icons/icon.png b/cli/tauri.js/templates/rust/src-tauri/icons/icon.png
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/icons/icon.png
rename to cli/tauri.js/templates/rust/src-tauri/icons/icon.png
diff --git a/cli/tauri.js/templates/src-tauri/rustfmt.toml b/cli/tauri.js/templates/rust/src-tauri/rustfmt.toml
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/rustfmt.toml
rename to cli/tauri.js/templates/rust/src-tauri/rustfmt.toml
diff --git a/cli/tauri.js/templates/src-tauri/src/cmd.rs b/cli/tauri.js/templates/rust/src-tauri/src/cmd.rs
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/src/cmd.rs
rename to cli/tauri.js/templates/rust/src-tauri/src/cmd.rs
diff --git a/cli/tauri.js/templates/src-tauri/src/main.rs b/cli/tauri.js/templates/rust/src-tauri/src/main.rs
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/src/main.rs
rename to cli/tauri.js/templates/rust/src-tauri/src/main.rs
diff --git a/cli/tauri.js/templates/src-tauri/src/updater.rs b/cli/tauri.js/templates/rust/src-tauri/src/updater.rs
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/src/updater.rs
rename to cli/tauri.js/templates/rust/src-tauri/src/updater.rs