diff --git a/index.html b/index.html
index 810766290..2f197cab7 100644
--- a/index.html
+++ b/index.html
@@ -66,7 +66,7 @@
   </div>
 </body>
 
-<script src='src/require.js'></script>
+<script src='src/stdlib/require.js'></script>
 <script>
   window.onerror = function() {
     window.showConsole(true)
diff --git a/src/app.coffee b/src/atom/app.coffee
similarity index 100%
rename from src/app.coffee
rename to src/atom/app.coffee
diff --git a/src/browser.coffee b/src/atom/browser.coffee
similarity index 100%
rename from src/browser.coffee
rename to src/atom/browser.coffee
diff --git a/src/document.coffee b/src/atom/document.coffee
similarity index 100%
rename from src/document.coffee
rename to src/atom/document.coffee
diff --git a/src/editor.coffee b/src/atom/editor.coffee
similarity index 100%
rename from src/editor.coffee
rename to src/atom/editor.coffee
diff --git a/src/extension.coffee b/src/atom/extension.coffee
similarity index 100%
rename from src/extension.coffee
rename to src/atom/extension.coffee
diff --git a/src/modal.coffee b/src/atom/modal.coffee
similarity index 100%
rename from src/modal.coffee
rename to src/atom/modal.coffee
diff --git a/src/pane.coffee b/src/atom/pane.coffee
similarity index 100%
rename from src/pane.coffee
rename to src/atom/pane.coffee
diff --git a/src/project.coffee b/src/atom/project.coffee
similarity index 100%
rename from src/project.coffee
rename to src/atom/project.coffee
diff --git a/src/window.coffee b/src/atom/window.coffee
similarity index 100%
rename from src/window.coffee
rename to src/atom/window.coffee
diff --git a/src/event.coffee b/src/stdlib/event.coffee
similarity index 100%
rename from src/event.coffee
rename to src/stdlib/event.coffee
diff --git a/src/fs.coffee b/src/stdlib/fs.coffee
similarity index 100%
rename from src/fs.coffee
rename to src/stdlib/fs.coffee
diff --git a/src/jscocoa.coffee b/src/stdlib/jscocoa.coffee
similarity index 100%
rename from src/jscocoa.coffee
rename to src/stdlib/jscocoa.coffee
diff --git a/src/key-binder.coffee b/src/stdlib/key-binder.coffee
similarity index 100%
rename from src/key-binder.coffee
rename to src/stdlib/key-binder.coffee
diff --git a/src/native.coffee b/src/stdlib/native.coffee
similarity index 100%
rename from src/native.coffee
rename to src/stdlib/native.coffee
diff --git a/src/require.coffee b/src/stdlib/require.coffee
similarity index 98%
rename from src/require.coffee
rename to src/stdlib/require.coffee
index 1e7e2cc97..096ee9c07 100644
--- a/src/require.coffee
+++ b/src/stdlib/require.coffee
@@ -7,8 +7,10 @@ else
   resourcePath = OSX.NSBundle.mainBundle.resourcePath
 
 paths = [
-  "#{resourcePath}/static"
+  "#{resourcePath}/src/stdlib"
+  "#{resourcePath}/src/atom"
   "#{resourcePath}/src"
+  "#{resourcePath}/static"
   "#{resourcePath}/extensions"
   "#{resourcePath}/vendor"
 ]
diff --git a/src/storage.coffee b/src/stdlib/storage.coffee
similarity index 100%
rename from src/storage.coffee
rename to src/stdlib/storage.coffee
diff --git a/src/watcher.coffee b/src/stdlib/watcher.coffee
similarity index 100%
rename from src/watcher.coffee
rename to src/stdlib/watcher.coffee