diff --git a/.bowerrc b/.bowerrc
index 22ea459..4f62f22 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "output/components"
+  "directory": "Output/Components"
 }
diff --git a/.gitignore b/.gitignore
index ab32c23..02d4af1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/output
+/Output
 /node_modules
 /.pulp-cache/
 /.psc*
diff --git a/CONTRIBUTING.md b/Contributing.md
similarity index 100%
rename from CONTRIBUTING.md
rename to Contributing.md
diff --git a/docs/examples/HelloWorld/Main.purs b/Documentation/Examples/HelloWorld/Main.purs
similarity index 100%
rename from docs/examples/HelloWorld/Main.purs
rename to Documentation/Examples/HelloWorld/Main.purs
diff --git a/docs/examples/HelloWorld/README.md b/Documentation/Examples/HelloWorld/Readme.md
similarity index 100%
rename from docs/examples/HelloWorld/README.md
rename to Documentation/Examples/HelloWorld/Readme.md
diff --git a/docs/examples/MultiRoute/Main.purs b/Documentation/Examples/MultiRoute/Main.purs
similarity index 100%
rename from docs/examples/MultiRoute/Main.purs
rename to Documentation/Examples/MultiRoute/Main.purs
diff --git a/docs/examples/MultiRoute/README.md b/Documentation/Examples/MultiRoute/Readme.md
similarity index 100%
rename from docs/examples/MultiRoute/README.md
rename to Documentation/Examples/MultiRoute/Readme.md
diff --git a/lib/HTTPure.purs b/Library/HTTPure.purs
similarity index 100%
rename from lib/HTTPure.purs
rename to Library/HTTPure.purs
diff --git a/lib/HTTPure/HTTPureM.purs b/Library/HTTPure/HTTPureM.purs
similarity index 100%
rename from lib/HTTPure/HTTPureM.purs
rename to Library/HTTPure/HTTPureM.purs
diff --git a/lib/HTTPure/Request.purs b/Library/HTTPure/Request.purs
similarity index 100%
rename from lib/HTTPure/Request.purs
rename to Library/HTTPure/Request.purs
diff --git a/lib/HTTPure/Response.purs b/Library/HTTPure/Response.purs
similarity index 100%
rename from lib/HTTPure/Response.purs
rename to Library/HTTPure/Response.purs
diff --git a/lib/HTTPure/Route.purs b/Library/HTTPure/Route.purs
similarity index 100%
rename from lib/HTTPure/Route.purs
rename to Library/HTTPure/Route.purs
diff --git a/lib/HTTPure/Server.purs b/Library/HTTPure/Server.purs
similarity index 100%
rename from lib/HTTPure/Server.purs
rename to Library/HTTPure/Server.purs
diff --git a/LICENSE b/License
similarity index 100%
rename from LICENSE
rename to License
diff --git a/Makefile b/Makefile
index d3492c2..e45d171 100644
--- a/Makefile
+++ b/Makefile
@@ -15,19 +15,19 @@ BOWERJSON := bower.json
 PACKAGEJSON := package.json
 
 # Various input directories
-SRCPATH := ./lib
-TESTPATH := ./test
-OUTPUT := ./output
-DOCS := ./docs
-EXAMPLESPATH := $(DOCS)/examples
+SRCPATH := ./Library
+TESTPATH := ./Test
+OUTPUT := ./Output
+DOCS := ./Documentation
+EXAMPLESPATH := $(DOCS)/Examples
 EXAMPLEPATH := $(EXAMPLESPATH)/$(EXAMPLE)
 
 # Various output directories
-BUILD := $(OUTPUT)/build
-COMPONENTS := $(OUTPUT)/components
-NODE_MODULES := ./node_modules
-OUTPUT_DOCS := $(OUTPUT)/docs
-OUTPUT_EXAMPLE := $(OUTPUT)/examples/$(EXAMPLE)
+BUILD := $(OUTPUT)/Build
+COMPONENTS := $(OUTPUT)/Components
+MODULES := $(OUTPUT)/node_modules
+OUTPUT_DOCS := $(OUTPUT)/Documentation
+OUTPUT_EXAMPLE := $(OUTPUT)/Examples/$(EXAMPLE)
 
 # The entry point for the compiled example, if an EXAMPLE is specified
 EXAMPLE_INDEX := $(OUTPUT_EXAMPLE)/index.js
@@ -40,15 +40,16 @@ EXAMPLESOURCES := $(EXAMPLESPATH)/**/*
 # This is the module name for the entry point for the test suite
 TESTMAIN := HTTPure.HTTPureSpec
 
-$(NODE_MODULES): $(PACKAGEJSON)
+$(MODULES): $(PACKAGEJSON)
 	$(NPM) install
+	mv node_modules $(MODULES)
 
 # Install bower components
 $(COMPONENTS): $(BOWERJSON)
 	$(BOWER) install
 
 # Build the source files
-$(BUILD): $(COMPONENTS) $(NODE_MODULES) $(SOURCES)
+$(BUILD): $(COMPONENTS) $(MODULES) $(SOURCES)
 	$(PULP) build \
 	  --src-path $(SRCPATH) \
 	  --build-path $(BUILD)
@@ -85,12 +86,13 @@ endif
 test: $(BUILD) $(TESTSOURCES) $(EXAMPLESOURCES)
 	$(PULP) test \
 	  --src-path $(SRCPATH) \
+	  --test-path $(TESTPATH) \
 	  --include $(EXAMPLESPATH) \
 	  --build-path $(BUILD) \
 	  --main $(TESTMAIN)
 
 # Launch a repl with all modules loaded
-repl: $(COMPONENTS) $(NODE_MODULES) $(SOURCES) $(TESTSOURCES) $(EXAMPLESOURCES)
+repl: $(COMPONENTS) $(MODULES) $(SOURCES) $(TESTSOURCES) $(EXAMPLESOURCES)
 	$(PULP) repl \
 	  --include $(EXAMPLESPATH) \
 	  --src-path $(SRCPATH) \
@@ -99,7 +101,6 @@ repl: $(COMPONENTS) $(NODE_MODULES) $(SOURCES) $(TESTSOURCES) $(EXAMPLESOURCES)
 # Remove all make output from the source tree
 clean:
 	rm -rf $(OUTPUT)
-	rm -rf $(NODE_MODULES)
 
 # Print out a description of all the supported tasks
 help:
@@ -115,7 +116,7 @@ help:
 	$(info - make help        Print this help)
 
 # Build the documentation
-$(OUTPUT_DOCS): $(COMPONENTS) $(NODE_MODULES) $(SOURCES)
+$(OUTPUT_DOCS): $(COMPONENTS) $(MODULES) $(SOURCES)
 	$(PULP) docs \
 	  --src-path $(SRCPATH)
 	rm -rf $(OUTPUT_DOCS)
diff --git a/README.md b/Readme.md
similarity index 100%
rename from README.md
rename to Readme.md
diff --git a/test/HTTPure/HTTPureMSpec.purs b/Test/HTTPure/HTTPureMSpec.purs
similarity index 100%
rename from test/HTTPure/HTTPureMSpec.purs
rename to Test/HTTPure/HTTPureMSpec.purs
diff --git a/test/HTTPure/IntegrationSpec.purs b/Test/HTTPure/IntegrationSpec.purs
similarity index 100%
rename from test/HTTPure/IntegrationSpec.purs
rename to Test/HTTPure/IntegrationSpec.purs
diff --git a/test/HTTPure/RequestSpec.purs b/Test/HTTPure/RequestSpec.purs
similarity index 100%
rename from test/HTTPure/RequestSpec.purs
rename to Test/HTTPure/RequestSpec.purs
diff --git a/test/HTTPure/ResponseSpec.purs b/Test/HTTPure/ResponseSpec.purs
similarity index 100%
rename from test/HTTPure/ResponseSpec.purs
rename to Test/HTTPure/ResponseSpec.purs
diff --git a/test/HTTPure/RouteSpec.purs b/Test/HTTPure/RouteSpec.purs
similarity index 100%
rename from test/HTTPure/RouteSpec.purs
rename to Test/HTTPure/RouteSpec.purs
diff --git a/test/HTTPure/ServerSpec.purs b/Test/HTTPure/ServerSpec.purs
similarity index 100%
rename from test/HTTPure/ServerSpec.purs
rename to Test/HTTPure/ServerSpec.purs
diff --git a/test/HTTPure/SpecHelpers.purs b/Test/HTTPure/SpecHelpers.purs
similarity index 100%
rename from test/HTTPure/SpecHelpers.purs
rename to Test/HTTPure/SpecHelpers.purs
diff --git a/test/HTTPureSpec.purs b/Test/HTTPureSpec.purs
similarity index 100%
rename from test/HTTPureSpec.purs
rename to Test/HTTPureSpec.purs
diff --git a/bower.json b/bower.json
index 4552378..3c81b24 100644
--- a/bower.json
+++ b/bower.json
@@ -9,8 +9,8 @@
   },
   "ignore": [
     "**/.*",
-    "output",
-    "test",
+    "Output",
+    "Test",
     "bower.json"
   ],
   "dependencies": {