diff --git a/source/documents/_scripts.html.jade b/source/documents/_scripts.html.jade
index e24a713..dae01cb 100644
--- a/source/documents/_scripts.html.jade
+++ b/source/documents/_scripts.html.jade
@@ -3,8 +3,7 @@ script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.js")
 // TODO use cdnjs.com once they serve marked
 script(src="//raw.github.com/chjj/marked/master/lib/marked.js")
 script(src="scripts/app.js")
-script(src="scripts/services.js")
-script(src="scripts/reader/_factory.js")
-script(src="scripts/reader/markdown.js")
-script(src="scripts/reader/json.js")
+script(src="scripts/services/reader/_factory.js")
+script(src="scripts/services/reader/markdown.js")
+script(src="scripts/services/reader/json.js")
 script(src="scripts/controllers.js")
diff --git a/source/documents/scripts/services.js.coffee b/source/documents/scripts/services.js.coffee
deleted file mode 100644
index e69de29..0000000
diff --git a/source/documents/scripts/reader/_factory.js.coffee b/source/documents/scripts/services/reader/_factory.js.coffee
similarity index 100%
rename from source/documents/scripts/reader/_factory.js.coffee
rename to source/documents/scripts/services/reader/_factory.js.coffee
diff --git a/source/documents/scripts/reader/json.js.coffee b/source/documents/scripts/services/reader/json.js.coffee
similarity index 100%
rename from source/documents/scripts/reader/json.js.coffee
rename to source/documents/scripts/services/reader/json.js.coffee
diff --git a/source/documents/scripts/reader/markdown.js.coffee b/source/documents/scripts/services/reader/markdown.js.coffee
similarity index 100%
rename from source/documents/scripts/reader/markdown.js.coffee
rename to source/documents/scripts/services/reader/markdown.js.coffee
diff --git a/source/documents/tests.html.jade b/source/documents/tests.html.jade
index ef466d2..d97fd9f 100644
--- a/source/documents/tests.html.jade
+++ b/source/documents/tests.html.jade
@@ -9,11 +9,11 @@ html
 		// test scripts
 		link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.css")
 		script(src="//cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.js")
-		script(src="scripts/tests/_setup.js")
-		script(src="scripts/tests/reader/_factory.js")
-		script(src="scripts/tests/reader/_abstract.js")
-		script(src="scripts/tests/reader/markdown.js")
-		script(src="scripts/tests/reader/json.js")
+		script(src="tests/_setup.js")
+		script(src="tests/services/reader/_factory.js")
+		script(src="tests/services/reader/_abstract.js")
+		script(src="tests/services/reader/markdown.js")
+		script(src="tests/services/reader/json.js")
 
 	body
 		div(id="qunit")
diff --git a/source/documents/scripts/tests/_setup.js.coffee b/source/documents/tests/_setup.js.coffee
similarity index 100%
rename from source/documents/scripts/tests/_setup.js.coffee
rename to source/documents/tests/_setup.js.coffee
diff --git a/source/documents/scripts/tests/reader/_abstract.js.coffee b/source/documents/tests/services/reader/_abstract.js.coffee
similarity index 100%
rename from source/documents/scripts/tests/reader/_abstract.js.coffee
rename to source/documents/tests/services/reader/_abstract.js.coffee
diff --git a/source/documents/scripts/tests/reader/_factory.js.coffee b/source/documents/tests/services/reader/_factory.js.coffee
similarity index 100%
rename from source/documents/scripts/tests/reader/_factory.js.coffee
rename to source/documents/tests/services/reader/_factory.js.coffee
diff --git a/source/documents/scripts/tests/reader/json.js.coffee b/source/documents/tests/services/reader/json.js.coffee
similarity index 100%
rename from source/documents/scripts/tests/reader/json.js.coffee
rename to source/documents/tests/services/reader/json.js.coffee
diff --git a/source/documents/scripts/tests/reader/markdown.js.coffee b/source/documents/tests/services/reader/markdown.js.coffee
similarity index 100%
rename from source/documents/scripts/tests/reader/markdown.js.coffee
rename to source/documents/tests/services/reader/markdown.js.coffee