diff --git a/README.md b/README.md
deleted file mode 100644
index 20333de..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-haskell-distributed.github.com
-==============================
-
-haskell-distributed website
\ No newline at end of file
diff --git a/Gemfile b/website/Gemfile
similarity index 100%
rename from Gemfile
rename to website/Gemfile
diff --git a/Makefile b/website/Makefile
similarity index 100%
rename from Makefile
rename to website/Makefile
diff --git a/_config.yml b/website/_config.yml
similarity index 100%
rename from _config.yml
rename to website/_config.yml
diff --git a/_includes/footer.html b/website/_includes/footer.html
similarity index 100%
rename from _includes/footer.html
rename to website/_includes/footer.html
diff --git a/_includes/head.html b/website/_includes/head.html
similarity index 100%
rename from _includes/head.html
rename to website/_includes/head.html
diff --git a/_includes/js.html b/website/_includes/js.html
similarity index 100%
rename from _includes/js.html
rename to website/_includes/js.html
diff --git a/_includes/nav.html b/website/_includes/nav.html
similarity index 100%
rename from _includes/nav.html
rename to website/_includes/nav.html
diff --git a/_layouts/default.html b/website/_layouts/default.html
similarity index 100%
rename from _layouts/default.html
rename to website/_layouts/default.html
diff --git a/_layouts/documentation.html b/website/_layouts/documentation.html
similarity index 100%
rename from _layouts/documentation.html
rename to website/_layouts/documentation.html
diff --git a/_layouts/marketing.html b/website/_layouts/marketing.html
similarity index 100%
rename from _layouts/marketing.html
rename to website/_layouts/marketing.html
diff --git a/_layouts/page.html b/website/_layouts/page.html
similarity index 100%
rename from _layouts/page.html
rename to website/_layouts/page.html
diff --git a/_layouts/post.html b/website/_layouts/post.html
similarity index 100%
rename from _layouts/post.html
rename to website/_layouts/post.html
diff --git a/_layouts/site.html b/website/_layouts/site.html
similarity index 100%
rename from _layouts/site.html
rename to website/_layouts/site.html
diff --git a/_layouts/team.html b/website/_layouts/team.html
similarity index 100%
rename from _layouts/team.html
rename to website/_layouts/team.html
diff --git a/_layouts/tutorial.html b/website/_layouts/tutorial.html
similarity index 100%
rename from _layouts/tutorial.html
rename to website/_layouts/tutorial.html
diff --git a/_layouts/tutorial2.html b/website/_layouts/tutorial2.html
similarity index 100%
rename from _layouts/tutorial2.html
rename to website/_layouts/tutorial2.html
diff --git a/_layouts/wiki.html b/website/_layouts/wiki.html
similarity index 100%
rename from _layouts/wiki.html
rename to website/_layouts/wiki.html
diff --git a/_posts/2012-01-21-cloud-haskell-appetiser.md b/website/_posts/2012-01-21-cloud-haskell-appetiser.md
similarity index 100%
rename from _posts/2012-01-21-cloud-haskell-appetiser.md
rename to website/_posts/2012-01-21-cloud-haskell-appetiser.md
diff --git a/_posts/2012-10-04-the-new-cloud-haskell.md b/website/_posts/2012-10-04-the-new-cloud-haskell.md
similarity index 100%
rename from _posts/2012-10-04-the-new-cloud-haskell.md
rename to website/_posts/2012-10-04-the-new-cloud-haskell.md
diff --git a/_posts/2012-10-05-communication-patterns-in-cloud-haskell.md b/website/_posts/2012-10-05-communication-patterns-in-cloud-haskell.md
similarity index 100%
rename from _posts/2012-10-05-communication-patterns-in-cloud-haskell.md
rename to website/_posts/2012-10-05-communication-patterns-in-cloud-haskell.md
diff --git a/_posts/2012-10-08-communication-patterns-in-cloud-haskell-2.md b/website/_posts/2012-10-08-communication-patterns-in-cloud-haskell-2.md
similarity index 100%
rename from _posts/2012-10-08-communication-patterns-in-cloud-haskell-2.md
rename to website/_posts/2012-10-08-communication-patterns-in-cloud-haskell-2.md
diff --git a/_posts/2012-10-12-communication-patterns-in-cloud-haskell-3.md b/website/_posts/2012-10-12-communication-patterns-in-cloud-haskell-3.md
similarity index 100%
rename from _posts/2012-10-12-communication-patterns-in-cloud-haskell-3.md
rename to website/_posts/2012-10-12-communication-patterns-in-cloud-haskell-3.md
diff --git a/_posts/2012-10-15-communication-patterns-in-cloud-haskell-4.md b/website/_posts/2012-10-15-communication-patterns-in-cloud-haskell-4.md
similarity index 100%
rename from _posts/2012-10-15-communication-patterns-in-cloud-haskell-4.md
rename to website/_posts/2012-10-15-communication-patterns-in-cloud-haskell-4.md
diff --git a/_posts/2013-01-29-announce-0.4.2.md b/website/_posts/2013-01-29-announce-0.4.2.md
similarity index 100%
rename from _posts/2013-01-29-announce-0.4.2.md
rename to website/_posts/2013-01-29-announce-0.4.2.md
diff --git a/_posts/2013-02-07-problems-with-threaded.md b/website/_posts/2013-02-07-problems-with-threaded.md
similarity index 100%
rename from _posts/2013-02-07-problems-with-threaded.md
rename to website/_posts/2013-02-07-problems-with-threaded.md
diff --git a/_posts/2014-02-06-new-cloud-haskell-website.md b/website/_posts/2014-02-06-new-cloud-haskell-website.md
similarity index 100%
rename from _posts/2014-02-06-new-cloud-haskell-website.md
rename to website/_posts/2014-02-06-new-cloud-haskell-website.md
diff --git a/_posts/2014-02-12-static-pointers.md b/website/_posts/2014-02-12-static-pointers.md
similarity index 100%
rename from _posts/2014-02-12-static-pointers.md
rename to website/_posts/2014-02-12-static-pointers.md
diff --git a/_posts/2014-03-28-network-transport-zeromq.md b/website/_posts/2014-03-28-network-transport-zeromq.md
similarity index 100%
rename from _posts/2014-03-28-network-transport-zeromq.md
rename to website/_posts/2014-03-28-network-transport-zeromq.md
diff --git a/_posts/2014-05-30-cloud-haskell-release-candidate-on-hackage.md b/website/_posts/2014-05-30-cloud-haskell-release-candidate-on-hackage.md
similarity index 100%
rename from _posts/2014-05-30-cloud-haskell-release-candidate-on-hackage.md
rename to website/_posts/2014-05-30-cloud-haskell-release-candidate-on-hackage.md
diff --git a/_posts/2014-06-13-cloud-haskell-is-live.md b/website/_posts/2014-06-13-cloud-haskell-is-live.md
similarity index 100%
rename from _posts/2014-06-13-cloud-haskell-is-live.md
rename to website/_posts/2014-06-13-cloud-haskell-is-live.md
diff --git a/_posts/2014-08-13-distributed-process-0.5.1.md b/website/_posts/2014-08-13-distributed-process-0.5.1.md
similarity index 100%
rename from _posts/2014-08-13-distributed-process-0.5.1.md
rename to website/_posts/2014-08-13-distributed-process-0.5.1.md
diff --git a/_posts/2015-06-17-cloud-haskell-0.2.2.md b/website/_posts/2015-06-17-cloud-haskell-0.2.2.md
similarity index 100%
rename from _posts/2015-06-17-cloud-haskell-0.2.2.md
rename to website/_posts/2015-06-17-cloud-haskell-0.2.2.md
diff --git a/_posts/2015-06-30-network-transport-inmemory-0.5.0.md b/website/_posts/2015-06-30-network-transport-inmemory-0.5.0.md
similarity index 100%
rename from _posts/2015-06-30-network-transport-inmemory-0.5.0.md
rename to website/_posts/2015-06-30-network-transport-inmemory-0.5.0.md
diff --git a/_posts/2016-02-19-announce-0.6.0.md b/website/_posts/2016-02-19-announce-0.6.0.md
similarity index 100%
rename from _posts/2016-02-19-announce-0.6.0.md
rename to website/_posts/2016-02-19-announce-0.6.0.md
diff --git a/about.html b/website/about.html
similarity index 100%
rename from about.html
rename to website/about.html
diff --git a/changes.md b/website/changes.md
similarity index 100%
rename from changes.md
rename to website/changes.md
diff --git a/contact.html b/website/contact.html
similarity index 100%
rename from contact.html
rename to website/contact.html
diff --git a/css/bootstrap-responsive.css b/website/css/bootstrap-responsive.css
similarity index 100%
rename from css/bootstrap-responsive.css
rename to website/css/bootstrap-responsive.css
diff --git a/css/bootstrap-responsive.min.css b/website/css/bootstrap-responsive.min.css
similarity index 100%
rename from css/bootstrap-responsive.min.css
rename to website/css/bootstrap-responsive.min.css
diff --git a/css/bootstrap.css b/website/css/bootstrap.css
similarity index 100%
rename from css/bootstrap.css
rename to website/css/bootstrap.css
diff --git a/css/bootstrap.min.css b/website/css/bootstrap.min.css
similarity index 100%
rename from css/bootstrap.min.css
rename to website/css/bootstrap.min.css
diff --git a/css/footer.css b/website/css/footer.css
similarity index 100%
rename from css/footer.css
rename to website/css/footer.css
diff --git a/css/nav.css b/website/css/nav.css
similarity index 100%
rename from css/nav.css
rename to website/css/nav.css
diff --git a/css/page.css b/website/css/page.css
similarity index 100%
rename from css/page.css
rename to website/css/page.css
diff --git a/css/pygments.css b/website/css/pygments.css
similarity index 100%
rename from css/pygments.css
rename to website/css/pygments.css
diff --git a/css/sidenav.css b/website/css/sidenav.css
similarity index 100%
rename from css/sidenav.css
rename to website/css/sidenav.css
diff --git a/css/site.css b/website/css/site.css
similarity index 100%
rename from css/site.css
rename to website/css/site.css
diff --git a/css/social.css b/website/css/social.css
similarity index 100%
rename from css/social.css
rename to website/css/social.css
diff --git a/documentation.md b/website/documentation.md
similarity index 100%
rename from documentation.md
rename to website/documentation.md
diff --git a/ico/favicon.ico b/website/ico/favicon.ico
similarity index 100%
rename from ico/favicon.ico
rename to website/ico/favicon.ico
diff --git a/img/NetworkTCP.png b/website/img/NetworkTCP.png
similarity index 100%
rename from img/NetworkTCP.png
rename to website/img/NetworkTCP.png
diff --git a/img/NetworkTCP.svg b/website/img/NetworkTCP.svg
similarity index 100%
rename from img/NetworkTCP.svg
rename to website/img/NetworkTCP.svg
diff --git a/img/OTP-Diagrams.png b/website/img/OTP-Diagrams.png
similarity index 100%
rename from img/OTP-Diagrams.png
rename to website/img/OTP-Diagrams.png
diff --git a/img/alert.png b/website/img/alert.png
similarity index 100%
rename from img/alert.png
rename to website/img/alert.png
diff --git a/img/back1.jpg b/website/img/back1.jpg
similarity index 100%
rename from img/back1.jpg
rename to website/img/back1.jpg
diff --git a/img/back2.jpg b/website/img/back2.jpg
similarity index 100%
rename from img/back2.jpg
rename to website/img/back2.jpg
diff --git a/img/back3.jpg b/website/img/back3.jpg
similarity index 100%
rename from img/back3.jpg
rename to website/img/back3.jpg
diff --git a/img/email_128x128.png b/website/img/email_128x128.png
similarity index 100%
rename from img/email_128x128.png
rename to website/img/email_128x128.png
diff --git a/img/feed-icon-14x14.png b/website/img/feed-icon-14x14.png
similarity index 100%
rename from img/feed-icon-14x14.png
rename to website/img/feed-icon-14x14.png
diff --git a/img/feed-icon-28x28.png b/website/img/feed-icon-28x28.png
similarity index 100%
rename from img/feed-icon-28x28.png
rename to website/img/feed-icon-28x28.png
diff --git a/img/github_logo_300x300.png b/website/img/github_logo_300x300.png
similarity index 100%
rename from img/github_logo_300x300.png
rename to website/img/github_logo_300x300.png
diff --git a/img/glyphicons-halflings-white.png b/website/img/glyphicons-halflings-white.png
similarity index 100%
rename from img/glyphicons-halflings-white.png
rename to website/img/glyphicons-halflings-white.png
diff --git a/img/glyphicons-halflings.png b/website/img/glyphicons-halflings.png
similarity index 100%
rename from img/glyphicons-halflings.png
rename to website/img/glyphicons-halflings.png
diff --git a/img/icon_irc.png b/website/img/icon_irc.png
similarity index 100%
rename from img/icon_irc.png
rename to website/img/icon_irc.png
diff --git a/img/info.png b/website/img/info.png
similarity index 100%
rename from img/info.png
rename to website/img/info.png
diff --git a/img/irc_icon.png b/website/img/irc_icon.png
similarity index 100%
rename from img/irc_icon.png
rename to website/img/irc_icon.png
diff --git a/img/logoBambooPNG.png b/website/img/logoBambooPNG.png
similarity index 100%
rename from img/logoBambooPNG.png
rename to website/img/logoBambooPNG.png
diff --git a/img/one-for-all-left-to-right.png b/website/img/one-for-all-left-to-right.png
similarity index 100%
rename from img/one-for-all-left-to-right.png
rename to website/img/one-for-all-left-to-right.png
diff --git a/img/one-for-all.png b/website/img/one-for-all.png
similarity index 100%
rename from img/one-for-all.png
rename to website/img/one-for-all.png
diff --git a/img/one-for-one.png b/website/img/one-for-one.png
similarity index 100%
rename from img/one-for-one.png
rename to website/img/one-for-one.png
diff --git a/img/sup1.png b/website/img/sup1.png
similarity index 100%
rename from img/sup1.png
rename to website/img/sup1.png
diff --git a/index.md b/website/index.md
similarity index 100%
rename from index.md
rename to website/index.md
diff --git a/js/bootstrap.js b/website/js/bootstrap.js
similarity index 100%
rename from js/bootstrap.js
rename to website/js/bootstrap.js
diff --git a/js/bootstrap.min.js b/website/js/bootstrap.min.js
similarity index 100%
rename from js/bootstrap.min.js
rename to website/js/bootstrap.min.js
diff --git a/js/jquery.js b/website/js/jquery.js
similarity index 100%
rename from js/jquery.js
rename to website/js/jquery.js
diff --git a/posts.md b/website/posts.md
similarity index 100%
rename from posts.md
rename to website/posts.md
diff --git a/rss.xml b/website/rss.xml
similarity index 100%
rename from rss.xml
rename to website/rss.xml
diff --git a/semantics/CloudHaskellSemantics.pdf b/website/semantics/CloudHaskellSemantics.pdf
similarity index 100%
rename from semantics/CloudHaskellSemantics.pdf
rename to website/semantics/CloudHaskellSemantics.pdf
diff --git a/semantics/CloudHaskellSemantics.tex b/website/semantics/CloudHaskellSemantics.tex
similarity index 100%
rename from semantics/CloudHaskellSemantics.tex
rename to website/semantics/CloudHaskellSemantics.tex
diff --git a/semantics/Makefile b/website/semantics/Makefile
similarity index 100%
rename from semantics/Makefile
rename to website/semantics/Makefile
diff --git a/semantics/references.bib b/website/semantics/references.bib
similarity index 100%
rename from semantics/references.bib
rename to website/semantics/references.bib
diff --git a/static/semantics.pdf b/website/static/semantics.pdf
similarity index 100%
rename from static/semantics.pdf
rename to website/static/semantics.pdf
diff --git a/static/templates/wikipage.mdt b/website/static/templates/wikipage.mdt
similarity index 100%
rename from static/templates/wikipage.mdt
rename to website/static/templates/wikipage.mdt
diff --git a/static/tutorial/tutorial-client.hs b/website/static/tutorial/tutorial-client.hs
similarity index 100%
rename from static/tutorial/tutorial-client.hs
rename to website/static/tutorial/tutorial-client.hs
diff --git a/static/tutorial/tutorial-server.hs b/website/static/tutorial/tutorial-server.hs
similarity index 100%
rename from static/tutorial/tutorial-server.hs
rename to website/static/tutorial/tutorial-server.hs
diff --git a/team.md b/website/team.md
similarity index 100%
rename from team.md
rename to website/team.md
diff --git a/terms.md b/website/terms.md
similarity index 100%
rename from terms.md
rename to website/terms.md
diff --git a/tutorials/1ch.md b/website/tutorials/1ch.md
similarity index 100%
rename from tutorials/1ch.md
rename to website/tutorials/1ch.md
diff --git a/tutorials/2ch.md b/website/tutorials/2ch.md
similarity index 100%
rename from tutorials/2ch.md
rename to website/tutorials/2ch.md
diff --git a/tutorials/3ch.md b/website/tutorials/3ch.md
similarity index 100%
rename from tutorials/3ch.md
rename to website/tutorials/3ch.md
diff --git a/tutorials/4ch.md b/website/tutorials/4ch.md
similarity index 100%
rename from tutorials/4ch.md
rename to website/tutorials/4ch.md
diff --git a/tutorials/5ch.md b/website/tutorials/5ch.md
similarity index 100%
rename from tutorials/5ch.md
rename to website/tutorials/5ch.md
diff --git a/tutorials/6ch.md b/website/tutorials/6ch.md
similarity index 100%
rename from tutorials/6ch.md
rename to website/tutorials/6ch.md
diff --git a/tutorials/tutorial-NT2.md b/website/tutorials/tutorial-NT2.md
similarity index 100%
rename from tutorials/tutorial-NT2.md
rename to website/tutorials/tutorial-NT2.md
diff --git a/wiki.md b/website/wiki.md
similarity index 100%
rename from wiki.md
rename to website/wiki.md
diff --git a/wiki/contributing.md b/website/wiki/contributing.md
similarity index 100%
rename from wiki/contributing.md
rename to website/wiki/contributing.md
diff --git a/wiki/development.md b/website/wiki/development.md
similarity index 100%
rename from wiki/development.md
rename to website/wiki/development.md
diff --git a/wiki/faq.md b/website/wiki/faq.md
similarity index 100%
rename from wiki/faq.md
rename to website/wiki/faq.md
diff --git a/wiki/maintainers.md b/website/wiki/maintainers.md
similarity index 100%
rename from wiki/maintainers.md
rename to website/wiki/maintainers.md
diff --git a/wiki/networktransport.md b/website/wiki/networktransport.md
similarity index 100%
rename from wiki/networktransport.md
rename to website/wiki/networktransport.md
diff --git a/wiki/newdesign.md b/website/wiki/newdesign.md
similarity index 100%
rename from wiki/newdesign.md
rename to website/wiki/newdesign.md
diff --git a/wiki/newtransports.md b/website/wiki/newtransports.md
similarity index 100%
rename from wiki/newtransports.md
rename to website/wiki/newtransports.md
diff --git a/wiki/otherprotocols.md b/website/wiki/otherprotocols.md
similarity index 100%
rename from wiki/otherprotocols.md
rename to website/wiki/otherprotocols.md
diff --git a/wiki/reliability.md b/website/wiki/reliability.md
similarity index 100%
rename from wiki/reliability.md
rename to website/wiki/reliability.md