diff --git a/lib/generate/site/index.js b/lib/generate/site/index.js
index 4d8803ee5..94ee6c039 100644
--- a/lib/generate/site/index.js
+++ b/lib/generate/site/index.js
@@ -36,13 +36,13 @@ Generator.prototype.load = function() {
 // Load all templates
 Generator.prototype.loadTemplates = function() {
     this.template = swig.compileFile(
-        this.plugins.template("site:page") || path.resolve(this.options.theme, 'templates/book/page.html')
+        this.plugins.template("site:page") || path.resolve(this.options.theme, 'templates/website/page.html')
     );
     this.langsTemplate = swig.compileFile(
-        this.plugins.template("site:langs") || path.resolve(this.options.theme, 'templates/book/langs.html')
+        this.plugins.template("site:langs") || path.resolve(this.options.theme, 'templates/website/langs.html')
     );
     this.glossaryTemplate = swig.compileFile(
-        this.plugins.template("site:glossary") || path.resolve(this.options.theme, 'templates/book/glossary.html')
+        this.plugins.template("site:glossary") || path.resolve(this.options.theme, 'templates/website/glossary.html')
     );
 };
 
@@ -154,12 +154,12 @@ Generator.prototype.convertFile = function(content, _input) {
     if (_output == "README.html") _output = "index.html";
     var output = path.join(this.options.output, _output);
     var basePath = path.relative(path.dirname(output), this.options.output) || ".";
-	
+
 	// Bug fix for issue #493 which would occur when relative-links are 2-level or more deep in win32
 	if (process.platform === 'win32') {
 		basePath = basePath.replace(/\\/g, '/');
 	}
-	
+
     return this.prepareFile(content, _input)
     .then(function(page) {
         // Index page in search
diff --git a/theme/templates/book/glossary.html b/theme/templates/website/glossary.html
similarity index 100%
rename from theme/templates/book/glossary.html
rename to theme/templates/website/glossary.html
diff --git a/theme/templates/book/includes/exercise.html b/theme/templates/website/includes/exercise.html
similarity index 100%
rename from theme/templates/book/includes/exercise.html
rename to theme/templates/website/includes/exercise.html
diff --git a/theme/templates/book/includes/font-settings.html b/theme/templates/website/includes/font-settings.html
similarity index 100%
rename from theme/templates/book/includes/font-settings.html
rename to theme/templates/website/includes/font-settings.html
diff --git a/theme/templates/book/includes/header.html b/theme/templates/website/includes/header.html
similarity index 100%
rename from theme/templates/book/includes/header.html
rename to theme/templates/website/includes/header.html
diff --git a/theme/templates/book/includes/quiz.html b/theme/templates/website/includes/quiz.html
similarity index 100%
rename from theme/templates/book/includes/quiz.html
rename to theme/templates/website/includes/quiz.html
diff --git a/theme/templates/book/includes/summary.html b/theme/templates/website/includes/summary.html
similarity index 100%
rename from theme/templates/book/includes/summary.html
rename to theme/templates/website/includes/summary.html
diff --git a/theme/templates/book/langs.html b/theme/templates/website/langs.html
similarity index 94%
rename from theme/templates/book/langs.html
rename to theme/templates/website/langs.html
index 49878ae4f..7b47fc509 100755
--- a/theme/templates/book/langs.html
+++ b/theme/templates/website/langs.html
@@ -1,4 +1,4 @@
-{% extends "../layout.html" %}
+{% extends "./layout.html" %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/theme/templates/layout.html b/theme/templates/website/layout.html
old mode 100755
new mode 100644
similarity index 100%
rename from theme/templates/layout.html
rename to theme/templates/website/layout.html
diff --git a/theme/templates/book/page.html b/theme/templates/website/page.html
similarity index 99%
rename from theme/templates/book/page.html
rename to theme/templates/website/page.html
index d1379a2e9..1d5db62cf 100644
--- a/theme/templates/book/page.html
+++ b/theme/templates/website/page.html
@@ -1,4 +1,4 @@
-{% extends "../layout.html" %}
+{% extends "./layout.html" %}
 
 {% block head %}
     {% parent %}