diff --git a/.gitignore b/.gitignore
index e1a3494e9..953a13f3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,4 +70,4 @@ htmlreport/MANIFEST
 # kdevelop 4.x
 *.kdev4
 
-htdocs/site/node_modules
+htdocs/node_modules
diff --git a/htdocs/site/Readme.md b/htdocs/Readme.md
similarity index 100%
rename from htdocs/site/Readme.md
rename to htdocs/Readme.md
diff --git a/htdocs/site/make.js b/htdocs/make.js
similarity index 78%
rename from htdocs/site/make.js
rename to htdocs/make.js
index e029675b2..93a2e92ae 100644
--- a/htdocs/site/make.js
+++ b/htdocs/make.js
@@ -35,9 +35,9 @@
 
         // pack.css
 
-        var inCss = cat(["css/normalize.css",
-                         "css/all.css",
-                         "css/demo.css"
+        var inCss = cat(["site/css/normalize.css",
+                         "site/css/all.css",
+                         "site/css/demo.css"
         ]);
 
         var packCss = cleanCSS.process(inCss, {
@@ -45,17 +45,17 @@
             keepSpecialComments: 0
         });
 
-        fs.writeFileSync("css/pack.css", packCss, "utf8");
+        fs.writeFileSync("site/css/pack.css", packCss, "utf8");
 
         echo();
-        echo("### Finished css/pack.css.");
+        echo("### Finished site/css/pack.css.");
 
         echo();
         echo("### Minifying js files...");
 
-        var inJs = cat(["js/cppcheck.js",
-                        "js/github.js",
-                        "js/picnet.table.filter.min.js"]);
+        var inJs = cat(["site/js/cppcheck.js",
+                        "site/js/github.js",
+                        "site/js/picnet.table.filter.min.js"]);
 
         var minifiedJs = UglifyJS.minify(inJs, {
             compress: true,
@@ -64,10 +64,10 @@
             warnings: false
         });
 
-        fs.writeFileSync("js/pack.js", minifiedJs.code, "utf8");
+        fs.writeFileSync("site/js/pack.js", minifiedJs.code, "utf8");
 
         echo();
-        echo("### Finished js/pack.js.");
+        echo("### Finished site/js/pack.js.");
     };
 
 
diff --git a/htdocs/site/package.json b/htdocs/package.json
similarity index 98%
rename from htdocs/site/package.json
rename to htdocs/package.json
index a481a0936..ee260659e 100644
--- a/htdocs/site/package.json
+++ b/htdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cppcheck-web",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "XhmikosR (https://github.com/XhmikosR)",
   "description": "The dependencies to build cppcheck's website",
   "homepage": "https://github.com/danmar/cppcheck",
diff --git a/htdocs/site/run-tests.js b/htdocs/run-tests.js
similarity index 93%
rename from htdocs/site/run-tests.js
rename to htdocs/run-tests.js
index e7d6eb5de..e835c902e 100644
--- a/htdocs/site/run-tests.js
+++ b/htdocs/run-tests.js
@@ -32,7 +32,7 @@ if (!test("-f", jshintBin)) {
     exit(1);
 }
 
-if (exec("node" + " " + jshintBin + " " + "make.js run-tests.js js/cppcheck.js js/github.js").code !== 0) {
+if (exec("node" + " " + jshintBin + " " + "make.js run-tests.js site/js/cppcheck.js site/js/github.js").code !== 0) {
     echo("*** JSHint failed! (return code != 0)");
     echo();
 } else {
@@ -56,4 +56,4 @@ if (!test("-f", csslintBin)) {
     echo("*** csslint failed! (return code != 0)");
     echo();
 }*/
-exec("node" + " " + csslintBin + " " + "css/all.css");
+exec("node" + " " + csslintBin + " " + "site/css/all.css");