diff --git a/.gitignore b/.gitignore
index 681ba07..b7d4400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-test_input/rendered_root
 virtenv
-
 *.pyc
 *.swp
diff --git a/verdandi/__init__.py b/__init__.py
similarity index 100%
rename from verdandi/__init__.py
rename to __init__.py
diff --git a/verdandi/constants.py b/constants.py
similarity index 100%
rename from verdandi/constants.py
rename to constants.py
diff --git a/verdandi/mixins/__init__.py b/mixins/__init__.py
similarity index 100%
rename from verdandi/mixins/__init__.py
rename to mixins/__init__.py
diff --git a/verdandi/mixins/assetsmixin.py b/mixins/assetsmixin.py
similarity index 100%
rename from verdandi/mixins/assetsmixin.py
rename to mixins/assetsmixin.py
diff --git a/verdandi/mixins/menuitemmixin.py b/mixins/menuitemmixin.py
similarity index 100%
rename from verdandi/mixins/menuitemmixin.py
rename to mixins/menuitemmixin.py
diff --git a/verdandi/mixins/messagemixin.py b/mixins/messagemixin.py
similarity index 100%
rename from verdandi/mixins/messagemixin.py
rename to mixins/messagemixin.py
diff --git a/verdandi/mixins/newsitemmixin.py b/mixins/newsitemmixin.py
similarity index 100%
rename from verdandi/mixins/newsitemmixin.py
rename to mixins/newsitemmixin.py
diff --git a/verdandi/mixins/rendermixin.py b/mixins/rendermixin.py
similarity index 100%
rename from verdandi/mixins/rendermixin.py
rename to mixins/rendermixin.py
diff --git a/verdandi/mixins/templatemixin.py b/mixins/templatemixin.py
similarity index 100%
rename from verdandi/mixins/templatemixin.py
rename to mixins/templatemixin.py
diff --git a/verdandi/modules/__init__.py b/modules/__init__.py
similarity index 100%
rename from verdandi/modules/__init__.py
rename to modules/__init__.py
diff --git a/verdandi/modules/commonassets.py b/modules/commonassets.py
similarity index 100%
rename from verdandi/modules/commonassets.py
rename to modules/commonassets.py
diff --git a/verdandi/modules/gallery.py b/modules/gallery.py
similarity index 100%
rename from verdandi/modules/gallery.py
rename to modules/gallery.py
diff --git a/verdandi/modules/newsfeed.py b/modules/newsfeed.py
similarity index 100%
rename from verdandi/modules/newsfeed.py
rename to modules/newsfeed.py
diff --git a/verdandi/modules/page.py b/modules/page.py
similarity index 100%
rename from verdandi/modules/page.py
rename to modules/page.py
diff --git a/test_input/content/content.md b/test_input/content/content.md
deleted file mode 100644
index f5f27e5..0000000
--- a/test_input/content/content.md
+++ /dev/null
@@ -1,27 +0,0 @@
-12.2.2014 13:37
-12.2.2014 23:42
-
-Test
-----
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
-
-Foo | Rofl | Lol
-----|------|-----
-A   |  B   |  C
-D   |  E   |  F
-
-
-Stet clita
-==========
-kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus
-
-* est
-* Lorem
-* ipsum
-* <strike>dolor</strike>
-* *sit*
-* **amet**.
-
-1. Lol
-2. No
-3. Nope
diff --git a/test_input/content/img/bar.png b/test_input/content/img/bar.png
deleted file mode 100644
index b8c45bc..0000000
Binary files a/test_input/content/img/bar.png and /dev/null differ
diff --git a/test_input/content/img/foo.png b/test_input/content/img/foo.png
deleted file mode 100644
index 3007543..0000000
Binary files a/test_input/content/img/foo.png and /dev/null differ
diff --git a/test_input/content/img/more_img/banana.png b/test_input/content/img/more_img/banana.png
deleted file mode 100644
index 631bdca..0000000
Binary files a/test_input/content/img/more_img/banana.png and /dev/null differ
diff --git a/test_input/content/news/test.md b/test_input/content/news/test.md
deleted file mode 100644
index 59af990..0000000
--- a/test_input/content/news/test.md
+++ /dev/null
@@ -1,7 +0,0 @@
-1.1.2016 12:00
-22.1.2016 17:00
-
-First test
-
-
-This is a first test newsitem
diff --git a/test_input/content/news/test1.md b/test_input/content/news/test1.md
deleted file mode 100644
index e670ebb..0000000
--- a/test_input/content/news/test1.md
+++ /dev/null
@@ -1,7 +0,0 @@
-15.1.2016 12:00
-22.1.2016 17:00
-
-Second test
-
-
-This is an other test newsitem
diff --git a/test_input/content/test_gallery/3ddrucker.jpg b/test_input/content/test_gallery/3ddrucker.jpg
deleted file mode 100644
index eda95a3..0000000
Binary files a/test_input/content/test_gallery/3ddrucker.jpg and /dev/null differ
diff --git a/test_input/content/test_gallery/description.md b/test_input/content/test_gallery/description.md
deleted file mode 100644
index 81bce18..0000000
--- a/test_input/content/test_gallery/description.md
+++ /dev/null
@@ -1,5 +0,0 @@
-28.1.2016
-14.2.2016
-
-This is a test gallery description.
-Awesome shit an stuff !
diff --git a/test_input/content/test_gallery/firecake.jpg b/test_input/content/test_gallery/firecake.jpg
deleted file mode 100644
index 0eb90dd..0000000
Binary files a/test_input/content/test_gallery/firecake.jpg and /dev/null differ
diff --git a/test_input/content/test_gallery/fullmatrix.jpg b/test_input/content/test_gallery/fullmatrix.jpg
deleted file mode 100644
index 38f7d21..0000000
Binary files a/test_input/content/test_gallery/fullmatrix.jpg and /dev/null differ
diff --git a/test_input/content/test_gallery/ledcube.jpg b/test_input/content/test_gallery/ledcube.jpg
deleted file mode 100644
index 38cb323..0000000
Binary files a/test_input/content/test_gallery/ledcube.jpg and /dev/null differ
diff --git a/test_input/content/test_gallery/nixie.jpg b/test_input/content/test_gallery/nixie.jpg
deleted file mode 100644
index 4bb87ed..0000000
Binary files a/test_input/content/test_gallery/nixie.jpg and /dev/null differ
diff --git a/test_input/templates/base.html b/test_input/templates/base.html
deleted file mode 100644
index dcd2549..0000000
--- a/test_input/templates/base.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-	<head>
-		<title>{{page_title}}</title>
-	</head>
-	<body>
-		{{menu}}
-		<br/>
-		{% block content %}
-			<h1 class="mainheading">{{page_title}}</h1>
-			{{content}}
-			<br/>
-			Created: {{content_creation_time.strftime('%d.%m.%Y %H:%M:%S')}}</br>
-			Edit: {{content_edit_time.strftime('%d.%m.%Y %H:%M:%S')}}</br>
-		{% endblock %}
-	</body>
-</html>
diff --git a/test_input/templates/gallery.html b/test_input/templates/gallery.html
deleted file mode 100644
index 1b548dd..0000000
--- a/test_input/templates/gallery.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-	<h1>{{page_title}}</h1>
-
-	{% for image in images %}
-		<a href="{{image.image}}"><img src="{{image.thumb}}" /></a>
-	{% endfor %}
-
-{% endblock %}
diff --git a/test_input/templates/newsfeed.html b/test_input/templates/newsfeed.html
deleted file mode 100644
index b981425..0000000
--- a/test_input/templates/newsfeed.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-
-{% for item in items %}
-	<div>
-		<h2>{{item.title}}</h2>
-		{{item.content}}
-	</div>
-{% endfor %}
-
-{% endblock %}
diff --git a/test_input/templates/newsfeed.rss b/test_input/templates/newsfeed.rss
deleted file mode 100644
index 03e9809..0000000
--- a/test_input/templates/newsfeed.rss
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<rss version="2.0">
-	<channel>
-		{% for item in items %}
-			<item>
-				<title>{{item.title}}</title>
-				<url>{{item.url}}</url>
-				<description>{{item.content}}</description>
-				<pubDate>{{item.creation_time.strftime('%d.%m.%Y %H:%M:%S')}}</pubDate>
-			</item>
-		{% endfor %}
-	</channel>
-</rss>
diff --git a/test_input/testblog.py b/test_input/testblog.py
deleted file mode 100644
index b88113a..0000000
--- a/test_input/testblog.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python2
-
-import sys
-sys.path.append('../')
-
-from verdandi.verdandi import Verdandi
-from verdandi.modules.page import Page
-from verdandi.modules.commonassets import CommonAssets
-from verdandi.modules.newsfeed import NewsFeed
-from verdandi.modules.gallery import Gallery
-
-class TestPage1(Page):
-	title = "A cool new Page"
-	menu_title = "New Page"
-	menu_label = "new_cool_page"
-
-class TestPage2(Page):
-	title = "An other cool Page"
-	assets = [('img/foo.png', 'img/'),
-				('img/foo.png', 'img/bar.png'),
-				('img/foo.png', 'img/bar')]
-	url = "page2.html"
-	menu_title = "Other new Page"
-	menu_label = "cool_page1"
-
-
-class TestPage3(Page):
-	title = "Yet an other cool Page"
-	menu_title = "Other new Page2"
-	menu_label = "cool_page2"
-	menu_parent = "cool_page1"
-	url = "subdir/page3.html"
-
-class Assets(CommonAssets):
-	assets = [('img', 'img/dir'),
-				('img/', 'img/files')]
-
-
-class News(NewsFeed):
-	title = "New News"
-	url = "news.html"
-	menu_title = "News"
-	menu_label = "news"
-
-class TestGallery(Gallery):
-	title = "A Test Gallery"
-	url = "testgallery.html"
-	gallery_directory = "test_gallery"
-	gallery_images_url = "img/test_gallery"
-
-
-class TestBlog(Verdandi):
-	modules = [TestPage1(),
-				TestPage2(),
-				TestPage3(),
-				Assets(),
-				News(),
-				TestGallery()]
-
-
-testblog = TestBlog()
-testblog.run()
diff --git a/verdandi/verdandi.py b/verdandi.py
similarity index 100%
rename from verdandi/verdandi.py
rename to verdandi.py