diff --git a/README.md b/README.md
index fe4084e..366478f 100644
--- a/README.md
+++ b/README.md
@@ -64,10 +64,10 @@ The website structure is very easy. The most important files and directories are
 - `config.toml`: Headlines, site title, many texts.
 - `data/resources/`: Content of the 3-column "resource" boxes which you can hover over and click to see the text.
 - `data/share/`: Services where people can share to. Is being used in the "Spread" section and the left-side sharing icons
-- `static/img/share`: Image files for share buttons.
-- `themes/hugo-creative-theme/static/`: CSS, images, and Javascript files for the design.
-- `themes/hugo-creative-theme/static/css/custom.css`: File where all custom CSS code should be written to.
-- `themes/hugo-creative-theme/layouts/`: HTML structure (scaffold) for the website. Useful if you want to add another section or modify anchor links or CSS classes.
+- `static/`: CSS, images, and Javascript files for the design.
+- `static/img/share/`: Image files for share buttons.
+- `static/css/custom.css`: File where all custom CSS code should be written to.
+- `layouts/`: HTML structure (scaffold) for the website. Useful if you want to add another section or modify anchor links or CSS classes.
 - `public/`: Built files which are used to display the website. Generated by running `hugo`.
 
 ## Technical background information
diff --git a/themes/hugo-creative-theme/layouts/index.html b/layouts/index.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/index.html
rename to layouts/index.html
diff --git a/themes/hugo-creative-theme/layouts/partials/about.html b/layouts/partials/about.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/about.html
rename to layouts/partials/about.html
diff --git a/themes/hugo-creative-theme/layouts/partials/contact.html b/layouts/partials/contact.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/contact.html
rename to layouts/partials/contact.html
diff --git a/themes/hugo-creative-theme/layouts/partials/head.html b/layouts/partials/head.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/head.html
rename to layouts/partials/head.html
diff --git a/themes/hugo-creative-theme/layouts/partials/js.html b/layouts/partials/js.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/js.html
rename to layouts/partials/js.html
diff --git a/themes/hugo-creative-theme/layouts/partials/modals.html b/layouts/partials/modals.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/modals.html
rename to layouts/partials/modals.html
diff --git a/themes/hugo-creative-theme/layouts/partials/nav.html b/layouts/partials/nav.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/nav.html
rename to layouts/partials/nav.html
diff --git a/themes/hugo-creative-theme/layouts/partials/reasons.html b/layouts/partials/reasons.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/reasons.html
rename to layouts/partials/reasons.html
diff --git a/themes/hugo-creative-theme/layouts/partials/resources.html b/layouts/partials/resources.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/resources.html
rename to layouts/partials/resources.html
diff --git a/themes/hugo-creative-theme/layouts/partials/sharecolumn.html b/layouts/partials/sharecolumn.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/sharecolumn.html
rename to layouts/partials/sharecolumn.html
diff --git a/themes/hugo-creative-theme/layouts/partials/spread.html b/layouts/partials/spread.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/spread.html
rename to layouts/partials/spread.html
diff --git a/themes/hugo-creative-theme/layouts/partials/start.html b/layouts/partials/start.html
similarity index 100%
rename from themes/hugo-creative-theme/layouts/partials/start.html
rename to layouts/partials/start.html
diff --git a/themes/hugo-creative-theme/static/css/animate.min.css b/static/css/animate.min.css
similarity index 100%
rename from themes/hugo-creative-theme/static/css/animate.min.css
rename to static/css/animate.min.css
diff --git a/themes/hugo-creative-theme/static/css/bootstrap.css b/static/css/bootstrap.css
similarity index 100%
rename from themes/hugo-creative-theme/static/css/bootstrap.css
rename to static/css/bootstrap.css
diff --git a/themes/hugo-creative-theme/static/css/bootstrap.min.css b/static/css/bootstrap.min.css
similarity index 100%
rename from themes/hugo-creative-theme/static/css/bootstrap.min.css
rename to static/css/bootstrap.min.css
diff --git a/themes/hugo-creative-theme/static/css/creative.css b/static/css/creative.css
similarity index 100%
rename from themes/hugo-creative-theme/static/css/creative.css
rename to static/css/creative.css
diff --git a/themes/hugo-creative-theme/static/css/custom.css b/static/css/custom.css
similarity index 100%
rename from themes/hugo-creative-theme/static/css/custom.css
rename to static/css/custom.css
diff --git a/themes/hugo-creative-theme/static/css/modals.css b/static/css/modals.css
similarity index 100%
rename from themes/hugo-creative-theme/static/css/modals.css
rename to static/css/modals.css
diff --git a/themes/hugo-creative-theme/static/favicon.ico b/static/favicon.ico
similarity index 100%
rename from themes/hugo-creative-theme/static/favicon.ico
rename to static/favicon.ico
diff --git a/themes/hugo-creative-theme/static/font-awesome/css/font-awesome.min.css b/static/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/css/font-awesome.min.css
rename to static/font-awesome/css/font-awesome.min.css
diff --git a/themes/hugo-creative-theme/static/font-awesome/fonts/FontAwesome.otf b/static/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/fonts/FontAwesome.otf
rename to static/font-awesome/fonts/FontAwesome.otf
diff --git a/themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.eot b/static/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.eot
rename to static/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.svg b/static/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.svg
rename to static/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.ttf b/static/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.ttf
rename to static/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.woff b/static/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.woff
rename to static/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.woff2 b/static/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from themes/hugo-creative-theme/static/font-awesome/fonts/fontawesome-webfont.woff2
rename to static/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.eot b/static/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.eot
rename to static/fonts/glyphicons-halflings-regular.eot
diff --git a/themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.svg b/static/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.svg
rename to static/fonts/glyphicons-halflings-regular.svg
diff --git a/themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.ttf b/static/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.ttf
rename to static/fonts/glyphicons-halflings-regular.ttf
diff --git a/themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.woff b/static/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.woff
rename to static/fonts/glyphicons-halflings-regular.woff
diff --git a/themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.woff2 b/static/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from themes/hugo-creative-theme/static/fonts/glyphicons-halflings-regular.woff2
rename to static/fonts/glyphicons-halflings-regular.woff2
diff --git a/themes/hugo-creative-theme/static/img/header.jpg b/static/img/header.jpg
similarity index 100%
rename from themes/hugo-creative-theme/static/img/header.jpg
rename to static/img/header.jpg
diff --git a/themes/hugo-creative-theme/static/img/marker.png b/static/img/marker.png
similarity index 100%
rename from themes/hugo-creative-theme/static/img/marker.png
rename to static/img/marker.png
diff --git a/public/img/portfolio/1.jpg b/static/img/resources/1.jpg
similarity index 100%
rename from public/img/portfolio/1.jpg
rename to static/img/resources/1.jpg
diff --git a/public/img/portfolio/2.jpg b/static/img/resources/2.jpg
similarity index 100%
rename from public/img/portfolio/2.jpg
rename to static/img/resources/2.jpg
diff --git a/public/img/portfolio/3.jpg b/static/img/resources/3.jpg
similarity index 100%
rename from public/img/portfolio/3.jpg
rename to static/img/resources/3.jpg
diff --git a/public/img/portfolio/4.jpg b/static/img/resources/4.jpg
similarity index 100%
rename from public/img/portfolio/4.jpg
rename to static/img/resources/4.jpg
diff --git a/public/img/portfolio/5.jpg b/static/img/resources/5.jpg
similarity index 100%
rename from public/img/portfolio/5.jpg
rename to static/img/resources/5.jpg
diff --git a/public/img/portfolio/6.jpg b/static/img/resources/6.jpg
similarity index 100%
rename from public/img/portfolio/6.jpg
rename to static/img/resources/6.jpg
diff --git a/themes/hugo-creative-theme/static/js/bootstrap.js b/static/js/bootstrap.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/bootstrap.js
rename to static/js/bootstrap.js
diff --git a/themes/hugo-creative-theme/static/js/bootstrap.min.js b/static/js/bootstrap.min.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/bootstrap.min.js
rename to static/js/bootstrap.min.js
diff --git a/themes/hugo-creative-theme/static/js/cbpAnimatedHeader.js b/static/js/cbpAnimatedHeader.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/cbpAnimatedHeader.js
rename to static/js/cbpAnimatedHeader.js
diff --git a/themes/hugo-creative-theme/static/js/classie.js b/static/js/classie.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/classie.js
rename to static/js/classie.js
diff --git a/themes/hugo-creative-theme/static/js/creative.js b/static/js/creative.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/creative.js
rename to static/js/creative.js
diff --git a/themes/hugo-creative-theme/static/js/gmaps.init.js b/static/js/gmaps.init.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/gmaps.init.js
rename to static/js/gmaps.init.js
diff --git a/themes/hugo-creative-theme/static/js/hpneo.gmaps.js b/static/js/hpneo.gmaps.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/hpneo.gmaps.js
rename to static/js/hpneo.gmaps.js
diff --git a/themes/hugo-creative-theme/static/js/jquery.easing.min.js b/static/js/jquery.easing.min.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/jquery.easing.min.js
rename to static/js/jquery.easing.min.js
diff --git a/themes/hugo-creative-theme/static/js/jquery.fittext.js b/static/js/jquery.fittext.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/jquery.fittext.js
rename to static/js/jquery.fittext.js
diff --git a/themes/hugo-creative-theme/static/js/jquery.js b/static/js/jquery.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/jquery.js
rename to static/js/jquery.js
diff --git a/themes/hugo-creative-theme/static/js/wow.min.js b/static/js/wow.min.js
similarity index 100%
rename from themes/hugo-creative-theme/static/js/wow.min.js
rename to static/js/wow.min.js
diff --git a/themes/hugo-creative-theme/static/img/resources/1.jpg b/themes/hugo-creative-theme/static/img/resources/1.jpg
deleted file mode 100644
index 44692cc..0000000
Binary files a/themes/hugo-creative-theme/static/img/resources/1.jpg and /dev/null differ
diff --git a/themes/hugo-creative-theme/static/img/resources/2.jpg b/themes/hugo-creative-theme/static/img/resources/2.jpg
deleted file mode 100644
index 0df8fde..0000000
Binary files a/themes/hugo-creative-theme/static/img/resources/2.jpg and /dev/null differ
diff --git a/themes/hugo-creative-theme/static/img/resources/3.jpg b/themes/hugo-creative-theme/static/img/resources/3.jpg
deleted file mode 100644
index 3b08627..0000000
Binary files a/themes/hugo-creative-theme/static/img/resources/3.jpg and /dev/null differ
diff --git a/themes/hugo-creative-theme/static/img/resources/4.jpg b/themes/hugo-creative-theme/static/img/resources/4.jpg
deleted file mode 100644
index 82243f2..0000000
Binary files a/themes/hugo-creative-theme/static/img/resources/4.jpg and /dev/null differ
diff --git a/themes/hugo-creative-theme/static/img/resources/5.jpg b/themes/hugo-creative-theme/static/img/resources/5.jpg
deleted file mode 100644
index cd87077..0000000
Binary files a/themes/hugo-creative-theme/static/img/resources/5.jpg and /dev/null differ
diff --git a/themes/hugo-creative-theme/static/img/resources/6.jpg b/themes/hugo-creative-theme/static/img/resources/6.jpg
deleted file mode 100644
index 9be6c5e..0000000
Binary files a/themes/hugo-creative-theme/static/img/resources/6.jpg and /dev/null differ