diff --git a/src/filesystem/interface.js b/src/filesystem/interface.js
index 373ec9d..32e4053 100644
--- a/src/filesystem/interface.js
+++ b/src/filesystem/interface.js
@@ -14,7 +14,7 @@ define(function(require) {
   var providers = require('src/providers/providers');
   var adapters = require('src/adapters/adapters');
 
-  var Shell = require('src/shell');
+  var Shell = require('src/shell/shell');
   var Intercom = require('intercom');
   var FSWatcher = require('src/fs-watcher');
   var Errors = require('src/errors');
diff --git a/src/environment.js b/src/shell/environment.js
similarity index 100%
rename from src/environment.js
rename to src/shell/environment.js
diff --git a/src/shell.js b/src/shell/shell.js
similarity index 99%
rename from src/shell.js
rename to src/shell/shell.js
index 41cc09d..bccd9f8 100644
--- a/src/shell.js
+++ b/src/shell/shell.js
@@ -3,7 +3,7 @@ define(function(require) {
 
   var Path = require('src/path');
   var Errors = require('src/errors');
-  var Environment = require('src/environment');
+  var Environment = require('src/shell/environment');
   var async = require('async');
 
   function Shell(fs, options) {