diff --git a/jsTestDriver.conf b/jsTestDriver.conf
index 48db8236..7d00e89d 100644
--- a/jsTestDriver.conf
+++ b/jsTestDriver.conf
@@ -2,12 +2,12 @@
 server: http://localhost:4224
 
 load:
-  - src/ace.js
-  - src/MEventEmitter.js
-  - src/mode/Text.js
-  - src/mode/*.js
-  - src/layer/*.js
-  - src/*.js
+  - src/ace/ace.js
+  - src/ace/MEventEmitter.js
+  - src/ace/mode/Text.js
+  - src/ace/mode/*.js
+  - src/ace/layer/*.js
+  - src/ace/*.js
   
-  - test/*.js
-  - test/mode/*.js
\ No newline at end of file
+  - src/test/*.js
+  - src/test/mode/*.js
\ No newline at end of file
diff --git a/test/ChangeDocumentTest.js b/src/test/ChangeDocumentTest.js
similarity index 100%
rename from test/ChangeDocumentTest.js
rename to src/test/ChangeDocumentTest.js
diff --git a/test/DocumentTest.js b/src/test/DocumentTest.js
similarity index 100%
rename from test/DocumentTest.js
rename to src/test/DocumentTest.js
diff --git a/test/EventEmitterTest.js b/src/test/EventEmitterTest.js
similarity index 100%
rename from test/EventEmitterTest.js
rename to src/test/EventEmitterTest.js
diff --git a/test/MockRenderer.js b/src/test/MockRenderer.js
similarity index 100%
rename from test/MockRenderer.js
rename to src/test/MockRenderer.js
diff --git a/test/NavigationTest.js b/src/test/NavigationTest.js
similarity index 100%
rename from test/NavigationTest.js
rename to src/test/NavigationTest.js
diff --git a/test/SelectionTest.js b/src/test/SelectionTest.js
similarity index 100%
rename from test/SelectionTest.js
rename to src/test/SelectionTest.js
diff --git a/test/TextEditTest.js b/src/test/TextEditTest.js
similarity index 100%
rename from test/TextEditTest.js
rename to src/test/TextEditTest.js
diff --git a/test/VirtualRendererTest.js b/src/test/VirtualRendererTest.js
similarity index 100%
rename from test/VirtualRendererTest.js
rename to src/test/VirtualRendererTest.js
diff --git a/test/assertions.js b/src/test/assertions.js
similarity index 100%
rename from test/assertions.js
rename to src/test/assertions.js
diff --git a/test/mode/CssTest.js b/src/test/mode/CssTest.js
similarity index 100%
rename from test/mode/CssTest.js
rename to src/test/mode/CssTest.js
diff --git a/test/mode/CssTokenizerTest.js b/src/test/mode/CssTokenizerTest.js
similarity index 100%
rename from test/mode/CssTokenizerTest.js
rename to src/test/mode/CssTokenizerTest.js
diff --git a/test/mode/HtmlTokenizerTest.js b/src/test/mode/HtmlTokenizerTest.js
similarity index 100%
rename from test/mode/HtmlTokenizerTest.js
rename to src/test/mode/HtmlTokenizerTest.js
diff --git a/test/mode/JavaScriptTest.js b/src/test/mode/JavaScriptTest.js
similarity index 100%
rename from test/mode/JavaScriptTest.js
rename to src/test/mode/JavaScriptTest.js
diff --git a/test/mode/JavaScriptTokenizerTest.js b/src/test/mode/JavaScriptTokenizerTest.js
similarity index 100%
rename from test/mode/JavaScriptTokenizerTest.js
rename to src/test/mode/JavaScriptTokenizerTest.js
diff --git a/test/mode/TextTest.js b/src/test/mode/TextTest.js
similarity index 100%
rename from test/mode/TextTest.js
rename to src/test/mode/TextTest.js
diff --git a/test/mode/XmlTest.js b/src/test/mode/XmlTest.js
similarity index 100%
rename from test/mode/XmlTest.js
rename to src/test/mode/XmlTest.js
diff --git a/test/mode/XmlTokenizerTest.js b/src/test/mode/XmlTokenizerTest.js
similarity index 100%
rename from test/mode/XmlTokenizerTest.js
rename to src/test/mode/XmlTokenizerTest.js