diff --git a/template/.editorconfig b/.editorconfig
similarity index 100%
rename from template/.editorconfig
rename to .editorconfig
diff --git a/template/.eslintrc.js b/.eslintrc.js
similarity index 100%
rename from template/.eslintrc.js
rename to .eslintrc.js
diff --git a/template/.gitignore b/.gitignore
similarity index 100%
rename from template/.gitignore
rename to .gitignore
diff --git a/README.md b/README.md
index 5b821a3..6ee0992 100644
--- a/README.md
+++ b/README.md
@@ -5,19 +5,36 @@
 
 > [ExpressJS](http://expressjs.com/) + [Nuxt.js](https://nuxtjs.org) = :zap:
 
-Live Demo: [https://codesandbox.io/s/github/nuxt-community/express-template/tree/demo](https://codesandbox.io/s/github/nuxt-community/express-template/tree/demo)
+Live Demo: [https://codesandbox.io/s/github/nuxt-community/express-template](https://codesandbox.io/s/github/nuxt-community/express-template)
 
 ## Installation
 
-This is a project template for [vue-cli](https://github.com/vuejs/vue-cli).
+This is a template project, clone or fork the repo and start your project
 
 ```bash
-vue init nuxt-community/express-template <project-name>
+git clone https://github.com/nuxt-community/express-template.git <project-name>
 cd <project-name> # move to your project
-npm install # or yarn install
+yarn install # or npm install
 ```
 
-> Make sure to use a version of vue-cli >= 2.1 (vue -V).
+## Build Setup
+
+```bash
+# install dependencies
+$ yarn install
+
+# serve with hot reload at localhost:3000
+$ yarn dev
+
+# build for production and launch server
+$ yarn build
+$ yarn start
+
+# generate static project
+$ yarn generate
+```
+
+For detailed explanation on how things work, check out [Nuxt.js docs](https://nuxtjs.org).
 
 ## ExpressJS Changes
 
@@ -47,3 +64,5 @@ npm install # or yarn install
 - [ExpressJS license](https://github.com/expressjs/express/blob/master/LICENSE)
 - [NuxtJS license](https://github.com/nuxt/nuxt.js/blob/master/LICENSE.md)
 - [VueJS license](https://github.com/vuejs/vue/blob/master/LICENSE)
+
+
diff --git a/template/api/index.js b/api/index.js
similarity index 91%
rename from template/api/index.js
rename to api/index.js
index 1138030..2796d4d 100644
--- a/template/api/index.js
+++ b/api/index.js
@@ -18,6 +18,7 @@ module.exports = app
 if (require.main === module) {
   const port = process.env.PORT || 3001
   app.listen(port, () => {
+    // eslint-disable-next-line no-console
     console.log(`API server listening on port ${port}`)
   })
 }
diff --git a/template/api/routes/test.js b/api/routes/test.js
similarity index 100%
rename from template/api/routes/test.js
rename to api/routes/test.js
diff --git a/template/api/routes/users.js b/api/routes/users.js
similarity index 100%
rename from template/api/routes/users.js
rename to api/routes/users.js
diff --git a/template/assets/README.md b/assets/README.md
similarity index 100%
rename from template/assets/README.md
rename to assets/README.md
diff --git a/template/components/Logo.vue b/components/Logo.vue
similarity index 97%
rename from template/components/Logo.vue
rename to components/Logo.vue
index 50c62a2..b1de012 100644
--- a/template/components/Logo.vue
+++ b/components/Logo.vue
@@ -1,4 +1,3 @@
-{{{{raw}}}}
 <template>
   <svg class="NuxtLogo" width="245" height="180" viewBox="0 0 452 342" xmlns="http://www.w3.org/2000/svg">
     <path
@@ -15,7 +14,6 @@
     />
   </svg>
 </template>
-{{{{/raw}}}}
 
 <style>
 .NuxtLogo {
diff --git a/template/components/README.md b/components/README.md
similarity index 100%
rename from template/components/README.md
rename to components/README.md
diff --git a/template/layouts/README.md b/layouts/README.md
similarity index 100%
rename from template/layouts/README.md
rename to layouts/README.md
diff --git a/template/layouts/default.vue b/layouts/default.vue
similarity index 97%
rename from template/layouts/default.vue
rename to layouts/default.vue
index cc002a7..4ee9ebb 100644
--- a/template/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,10 +1,8 @@
-{{{{raw}}}}
 <template>
   <div>
     <Nuxt />
   </div>
 </template>
-{{{{/raw}}}}
 
 <style>
 html {
diff --git a/template/layouts/error.vue b/layouts/error.vue
similarity index 84%
rename from template/layouts/error.vue
rename to layouts/error.vue
index 8278ad7..8bf5855 100644
--- a/template/layouts/error.vue
+++ b/layouts/error.vue
@@ -1,4 +1,3 @@
-{{{{raw}}}}
 <template>
   <section class="container">
     <div>
@@ -9,16 +8,21 @@
       <h2 class="info">
         {{ error.message }}
       </h2>
-      <nuxt-link class="button" to="/" v-if="error.statusCode === 404">
+      <nuxt-link v-if="error.statusCode === 404" class="button" to="/">
         Homepage
       </nuxt-link>
     </div>
   </section>
 </template>
-{{{{/raw}}}}
+
 <script>
 export default {
-  props: ['error']
+  props: {
+    error: {
+      type: Object,
+      default: () => ({})
+    }
+  }
 }
 </script>
 
diff --git a/meta.js b/meta.js
deleted file mode 100644
index 522dc56..0000000
--- a/meta.js
+++ /dev/null
@@ -1,25 +0,0 @@
-module.exports = {
-  helpers: {
-    raw: function(options) {
-      return options.fn(this)
-    }
-  },
-  prompts: {
-    name: {
-      'type': 'string',
-      'required': true,
-      'message': 'Project name'
-    },
-    description: {
-      'type': 'string',
-      'required': false,
-      'message': 'Project description',
-      'default': 'Nuxt.js project'
-    },
-    author: {
-      'type': 'string',
-      'message': 'Author'
-    },
-  },
-  completeMessage: '{{#inPlace}}To get started:\n\n  npm install # Or yarn\n  npm run dev{{else}}To get started:\n\n  cd {{destDirName}}\n  npm install # Or yarn\n  npm run dev{{/inPlace}}'
-};
diff --git a/template/middleware/README.md b/middleware/README.md
similarity index 100%
rename from template/middleware/README.md
rename to middleware/README.md
diff --git a/template/nuxt.config.js b/nuxt.config.js
similarity index 98%
rename from template/nuxt.config.js
rename to nuxt.config.js
index 5ff4d05..ff373e2 100644
--- a/template/nuxt.config.js
+++ b/nuxt.config.js
@@ -46,7 +46,7 @@ export default {
   */
   buildModules: [
     // Doc: https://github.com/nuxt-community/eslint-module
-    '@nuxtjs/eslint-module',
+    '@nuxtjs/eslint-module'
   ],
 
   /*
diff --git a/template/package.json b/package.json
similarity index 86%
rename from template/package.json
rename to package.json
index 030a6ae..e233e08 100644
--- a/template/package.json
+++ b/package.json
@@ -1,8 +1,6 @@
 {
-  "name": "name",
+  "name": "nuxt-express",
   "version": "1.0.0",
-  "description": "{{ description }}",
-  "author": "{{ author }}",
   "private": true,
   "scripts": {
     "dev": "nuxt",
diff --git a/template/pages/README.md b/pages/README.md
similarity index 100%
rename from template/pages/README.md
rename to pages/README.md
diff --git a/template/pages/index.vue b/pages/index.vue
similarity index 98%
rename from template/pages/index.vue
rename to pages/index.vue
index 6f471ad..a76cb56 100644
--- a/template/pages/index.vue
+++ b/pages/index.vue
@@ -1,4 +1,3 @@
-{{{{raw}}}}
 <template>
   <div class="container">
     <div>
@@ -38,7 +37,7 @@
     </div>
   </div>
 </template>
-{{{{/raw}}}}
+
 <script>
 export default {
   async asyncData ({ $http }) {
diff --git a/template/pages/users/_id.vue b/pages/users/_id.vue
similarity index 97%
rename from template/pages/users/_id.vue
rename to pages/users/_id.vue
index a5245d5..e59bbb6 100644
--- a/template/pages/users/_id.vue
+++ b/pages/users/_id.vue
@@ -1,4 +1,3 @@
-{{{{raw}}}}
 <template>
   <section class="container">
     <div>
@@ -15,7 +14,6 @@
     </div>
   </section>
 </template>
-{{{{/raw}}}}
 
 <script>
 export default {
diff --git a/template/pages/users/index.vue b/pages/users/index.vue
similarity index 97%
rename from template/pages/users/index.vue
rename to pages/users/index.vue
index 7a4e6b0..6a7e9a1 100644
--- a/template/pages/users/index.vue
+++ b/pages/users/index.vue
@@ -1,4 +1,3 @@
-{{{{raw}}}}
 <template>
   <section class="container">
     <div>
@@ -19,7 +18,6 @@
     </div>
   </section>
 </template>
-{{{{/raw}}}}
 
 <script>
 export default {
diff --git a/template/plugins/README.md b/plugins/README.md
similarity index 100%
rename from template/plugins/README.md
rename to plugins/README.md
diff --git a/template/static/README.md b/static/README.md
similarity index 100%
rename from template/static/README.md
rename to static/README.md
diff --git a/template/static/favicon.ico b/static/favicon.ico
similarity index 100%
rename from template/static/favicon.ico
rename to static/favicon.ico
diff --git a/template/store/README.md b/store/README.md
similarity index 100%
rename from template/store/README.md
rename to store/README.md
diff --git a/template/README.md b/template/README.md
deleted file mode 100644
index 87aa59d..0000000
--- a/template/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# nuxt-express
-
-## Build Setup
-
-```bash
-# install dependencies
-$ yarn install
-
-# serve with hot reload at localhost:3000
-$ yarn dev
-
-# build for production and launch server
-$ yarn build
-$ yarn start
-
-# generate static project
-$ yarn generate
-```
-
-For detailed explanation on how things work, check out [Nuxt.js docs](https://nuxtjs.org).