diff --git a/.gitignore b/.gitignore
index a6cb17d..c2151e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 npm-debug.log
-public/**/*.css
+static/css/theme.css
+static/css/theme.min.css
 node_modules
-public/fonts
-!public/fonts/.gitkeep
\ No newline at end of file
+static/fonts
+!static/fonts/.gitkeep
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..ae2c036
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 AUBM
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/TOTO.md b/TOTO.md
index 1da8b75..f1bb191 100644
--- a/TOTO.md
+++ b/TOTO.md
@@ -1,3 +1 @@
 - Add support for code highlighting
-- Display a list of categories and tags in the navbar
-- Change folder structure to be a actual theme for Hugo
diff --git a/archetypes/default.md b/archetypes/default.md
new file mode 100644
index 0000000..ac36e06
--- /dev/null
+++ b/archetypes/default.md
@@ -0,0 +1,2 @@
++++
++++
diff --git a/gulpfile.js b/gulpfile.js
index 4ff428e..ce1c007 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,24 +1,20 @@
 var gulp = require('gulp');
 var gutil = require('gulp-util');
 var sass = require('gulp-sass');
-var browserSync = require('browser-sync').create();
 
 gulp.task('fonts', function() {
     gulp.src('./node_modules/bootstrap-sass/assets/fonts/bootstrap/*')
-        .pipe(gulp.dest('./public/fonts'));
-});
-
-gulp.task('serve', ['fonts', 'sass'] , function () {
-    browserSync.init({ server: { baseDir: "./public" } });
-    gulp.watch("public/**/*.scss", ['sass']);
-    gulp.watch("public/*.html").on('change', browserSync.reload);
+        .pipe(gulp.dest('./static/fonts'));
 });
 
 gulp.task('sass', function() {
-    return gulp.src("./public/**/*.scss")
+    return gulp.src("./static/css/theme.scss")
         .pipe(sass().on('error', handleError))
-        .pipe(gulp.dest('./public'))
-        .pipe(browserSync.stream());
+        .pipe(gulp.dest('./static/css'));
+});
+
+gulp.task('default', function() {
+    gulp.start('fonts', 'sass');
 });
 
 function handleError(err) {
diff --git a/public/fonts/.gitkeep b/layouts/404.html
similarity index 100%
rename from public/fonts/.gitkeep
rename to layouts/404.html
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
new file mode 100644
index 0000000..e69de29
diff --git a/public/index.html b/layouts/index.html
similarity index 100%
rename from public/index.html
rename to layouts/index.html
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000..e69de29
diff --git a/package.json b/package.json
index a44752d..0badc9b 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,11 @@
     "bootstrap-sass": "^3.3.6"
   },
   "devDependencies": {
-    "browser-sync": "^2.11.1",
     "gulp": "^3.9.0",
     "gulp-sass": "^2.1.1",
     "gulp-util": "^3.0.7"
   },
   "scripts": {
-    "serve": "gulp serve"
+    "build": "gulp"
   }
 }
diff --git a/public/css/_custom-bootstrap.scss b/static/css/_custom-bootstrap.scss
similarity index 100%
rename from public/css/_custom-bootstrap.scss
rename to static/css/_custom-bootstrap.scss
diff --git a/public/css/_mixins.scss b/static/css/_mixins.scss
similarity index 100%
rename from public/css/_mixins.scss
rename to static/css/_mixins.scss
diff --git a/public/css/_variables.scss b/static/css/_variables.scss
similarity index 100%
rename from public/css/_variables.scss
rename to static/css/_variables.scss
diff --git a/public/css/theme.scss b/static/css/theme.scss
similarity index 96%
rename from public/css/theme.scss
rename to static/css/theme.scss
index 367d697..1257f22 100644
--- a/public/css/theme.scss
+++ b/static/css/theme.scss
@@ -1,4 +1,3 @@
-//@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 @import "./variables.scss";
 @import "./custom-bootstrap.scss";
 @import "./mixins.scss";
diff --git a/static/fonts/.gitkeep b/static/fonts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/public/img/twitthome_schema.png b/static/img/twitthome_schema.png
similarity index 100%
rename from public/img/twitthome_schema.png
rename to static/img/twitthome_schema.png
diff --git a/public/js/theme.js b/static/js/theme.js
similarity index 100%
rename from public/js/theme.js
rename to static/js/theme.js
diff --git a/theme.toml b/theme.toml
new file mode 100644
index 0000000..3ab9043
--- /dev/null
+++ b/theme.toml
@@ -0,0 +1,14 @@
+# theme.toml template for a Hugo theme
+# See https://github.com/spf13/hugoThemes#themetoml for an example
+
+name = "Code Editor"
+license = "MIT"
+licenselink = "https://github.com/aubm/hugo-code-editor-theme/blob/master/LICENSE.md"
+description = "Inspired by Atom editor"
+homepage = "http://www.aubm.net/"
+tags = ["Atom", "Code"]
+min_version = 0.14
+
+[author]
+  name = "Aurélien Baumann (Aubm)"
+  homepage = "http://www.aubm.net"