diff --git a/.gitignore b/.gitignore
index 2081a90d52f..922d1d9afc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,10 +123,10 @@ debian/mongodb
 .DS_Store
 
 #third party
-third_party/js-1.7/jsautocfg.h
-third_party/js-1.7/jsautokw.h
-third_party/js-1.7/jskwgen
-third_party/js-1.7/jscpucfg
+src/third_party/js-1.7/jsautocfg.h
+src/third_party/js-1.7/jsautokw.h
+src/third_party/js-1.7/jskwgen
+src/third_party/js-1.7/jscpucfg
 
 # QtCreator
 *.config
diff --git a/SConstruct b/SConstruct
index 4cb535cf36d..ce558f6cf6f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -34,7 +34,7 @@ def findSettingsSetup():
 
 def getThirdPartyShortNames():
     lst = []
-    for x in os.listdir( "third_party" ):
+    for x in os.listdir( "src/third_party" ):
         if not x.endswith( ".py" ) or x.find( "#" ) >= 0:
             continue
          
@@ -261,7 +261,8 @@ if has_option( "cpppath" ):
     env["CPPPATH"] = [get_option( "cpppath" )]
 
 env.Append( CPPDEFINES=[ "_SCONS" , "MONGO_EXPOSE_MACROS" ] )
-env.Append( CPPPATH=[ "." ] )
+env.Append( CPPPATH=[ "./src/mongo" ] )
+env.Append( CPPPATH=[ "./src/" ] )
 
 if has_option( "safeshell" ):
     env.Append( CPPDEFINES=[ "MONGO_SAFE_SHELL" ] )
@@ -336,7 +337,7 @@ class InstallSetup:
         self.headers = True
         self.bannerDir = "distsrc/client/"
         self.headerRoot = ""
-        self.clientTestsDir = "client/examples/"
+        self.clientTestsDir = "src/mongo/client/examples/"
         
 installSetup = InstallSetup()
 if distBuild:
@@ -349,119 +350,119 @@ if has_option( "full" ):
 
 # ------    SOURCE FILE SETUP -----------
 
-commonFiles = Split( "pch.cpp buildinfo.cpp db/indexkey.cpp db/jsobj.cpp bson/oid.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp db/querypattern.cpp db/projection.cpp shell/mongo.cpp" )
-commonFiles += [ "util/background.cpp" , "util/intrusive_counter.cpp",
-                 "util/util.cpp" , "util/file_allocator.cpp" ,
-                 "util/assert_util.cpp" , "util/log.cpp" , "util/ramlog.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/concurrency/task.cpp", "util/debug_util.cpp",
-                 "util/concurrency/thread_pool.cpp", "util/password.cpp", "util/version.cpp", "util/signal_handlers.cpp",  
-                 "util/histogram.cpp", "util/concurrency/spin_lock.cpp", "util/text.cpp" , "util/stringutils.cpp" ,
-                 "util/concurrency/synchronization.cpp" ]
-commonFiles += [ "util/net/sock.cpp" , "util/net/httpclient.cpp" , "util/net/message.cpp" , "util/net/message_port.cpp" , "util/net/listen.cpp" ]
-commonFiles += Glob( "util/*.c" ) 
-commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclient_rs.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp client/distlock.cpp s/shardconnection.cpp" )
+commonFiles = [ "src/mongo/pch.cpp" , "src/mongo/buildinfo.cpp" , "src/mongo/db/indexkey.cpp" , "src/mongo/db/jsobj.cpp" , "src/mongo/bson/oid.cpp" , "src/mongo/db/json.cpp" , "src/mongo/db/lasterror.cpp" , "src/mongo/db/nonce.cpp" , "src/mongo/db/queryutil.cpp" , "src/mongo/db/querypattern.cpp" , "src/mongo/db/projection.cpp" , "src/mongo/shell/mongo.cpp" ]
+commonFiles += [ "src/mongo/util/background.cpp" , "src/mongo/util/intrusive_counter.cpp",
+                 "src/mongo/util/util.cpp" , "src/mongo/util/file_allocator.cpp" ,
+                 "src/mongo/util/assert_util.cpp" , "src/mongo/util/log.cpp" , "src/mongo/util/ramlog.cpp" , "src/mongo/util/md5main.cpp" , "src/mongo/util/base64.cpp", "src/mongo/util/concurrency/vars.cpp", "src/mongo/util/concurrency/task.cpp", "src/mongo/util/debug_util.cpp",
+                 "src/mongo/util/concurrency/thread_pool.cpp", "src/mongo/util/password.cpp", "src/mongo/util/version.cpp", "src/mongo/util/signal_handlers.cpp",  
+                 "src/mongo/util/histogram.cpp", "src/mongo/util/concurrency/spin_lock.cpp", "src/mongo/util/text.cpp" , "src/mongo/util/stringutils.cpp" ,
+                 "src/mongo/util/concurrency/synchronization.cpp" ]
+commonFiles += [ "src/mongo/util/net/sock.cpp" , "src/mongo/util/net/httpclient.cpp" , "src/mongo/util/net/message.cpp" , "src/mongo/util/net/message_port.cpp" , "src/mongo/util/net/listen.cpp" ]
+commonFiles += Glob( "src/mongo/util/*.c" ) 
+commonFiles += [ "src/mongo/client/connpool.cpp" , "src/mongo/client/dbclient.cpp" , "src/mongo/client/dbclient_rs.cpp" , "src/mongo/client/dbclientcursor.cpp" , "src/mongo/client/model.cpp" , "src/mongo/client/syncclusterconnection.cpp" , "src/mongo/client/distlock.cpp" , "src/mongo/s/shardconnection.cpp" ] 
 
 #mmap stuff
 
-coreDbFiles = [ "db/commands.cpp" ]
-coreServerFiles = [ "util/net/message_server_port.cpp" , 
-                    "client/parallel.cpp" , "db/common.cpp", 
-                    "util/net/miniwebserver.cpp" , "db/dbwebserver.cpp" , 
-                    "db/matcher.cpp" , "db/dbcommands_generic.cpp" , "db/commands/cloud.cpp", "db/dbmessage.cpp" ]
+coreDbFiles = [ "src/mongo/db/commands.cpp" ]
+coreServerFiles = [ "src/mongo/util/net/message_server_port.cpp" , 
+                    "src/mongo/client/parallel.cpp" , "src/mongo/db/common.cpp", 
+                    "src/mongo/util/net/miniwebserver.cpp" , "src/mongo/db/dbwebserver.cpp" , 
+                    "src/mongo/db/matcher.cpp" , "src/mongo/db/dbcommands_generic.cpp" , "src/mongo/db/commands/cloud.cpp", "src/mongo/db/dbmessage.cpp" ]
 
-mmapFiles = [ "util/mmap.cpp" ]
+mmapFiles = [ "src/mongo/util/mmap.cpp" ]
 
 if has_option( "mm" ):
-    mmapFiles += [ "util/mmap_mm.cpp" ]
+    mmapFiles += [ "src/mongo/util/mmap_mm.cpp" ]
 elif os.sys.platform == "win32":
-    mmapFiles += [ "util/mmap_win.cpp" ]
+    mmapFiles += [ "src/mongo/util/mmap_win.cpp" ]
 else:
-    mmapFiles += [ "util/mmap_posix.cpp" ]
+    mmapFiles += [ "src/mongo/util/mmap_posix.cpp" ]
 
 #coreServerFiles += mmapFiles
 
 # handle processinfo*
-processInfoFiles = [ "util/processinfo.cpp" ]
+processInfoFiles = [ "src/mongo/util/processinfo.cpp" ]
 
-if os.path.exists( "util/processinfo_" + os.sys.platform + ".cpp" ):
-    processInfoFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
+if os.path.exists( "src/mongo/util/processinfo_" + os.sys.platform + ".cpp" ):
+    processInfoFiles += [ "src/mongo/util/processinfo_" + os.sys.platform + ".cpp" ]
 elif os.sys.platform == "linux3":
-    processInfoFiles += [ "util/processinfo_linux2.cpp" ]
+    processInfoFiles += [ "src/mongo/util/processinfo_linux2.cpp" ]
 else:
-    processInfoFiles += [ "util/processinfo_none.cpp" ]
+    processInfoFiles += [ "src/mongo/util/processinfo_none.cpp" ]
 
 coreServerFiles += processInfoFiles
 
 # handle systeminfo*
 systemInfoFiles = [ ]
-if os.path.exists( "util/systeminfo_" + os.sys.platform + ".cpp" ):
-    systemInfoFiles += [ "util/systeminfo_" + os.sys.platform + ".cpp" ]
+if os.path.exists( "src/mongo/util/systeminfo_" + os.sys.platform + ".cpp" ):
+    systemInfoFiles += [ "src/mongo/util/systeminfo_" + os.sys.platform + ".cpp" ]
 elif os.sys.platform == "linux3":
-    systemInfoFiles += [ "util/systeminfo_linux2.cpp" ]
+    systemInfoFiles += [ "src/mongo/util/systeminfo_linux2.cpp" ]
 else:
-    systemInfoFiles += [ "util/systeminfo_none.cpp" ]
+    systemInfoFiles += [ "src/mongo/util/systeminfo_none.cpp" ]
 
 coreServerFiles += systemInfoFiles
 
 
 if has_option( "asio" ):
-    coreServerFiles += [ "util/net/message_server_asio.cpp" ]
+    coreServerFiles += [ "src/mongo/util/net/message_server_asio.cpp" ]
 
 # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client libs.
-serverOnlyFiles = Split( "db/curop.cpp db/d_globals.cpp db/pagefault.cpp util/compress.cpp db/d_concurrency.cpp db/key.cpp db/btreebuilder.cpp util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/record.cpp db/cursor.cpp db/security.cpp db/queryoptimizer.cpp db/queryoptimizercursor.cpp db/extsort.cpp db/cmdline.cpp" )
+serverOnlyFiles = [ "src/mongo/db/curop.cpp" , "src/mongo/db/d_globals.cpp" , "src/mongo/db/pagefault.cpp" , "src/mongo/util/compress.cpp" , "src/mongo/db/d_concurrency.cpp" , "src/mongo/db/key.cpp" , "src/mongo/db/btreebuilder.cpp" , "src/mongo/util/logfile.cpp" , "src/mongo/util/alignedbuilder.cpp" , "src/mongo/db/mongommf.cpp" , "src/mongo/db/dur.cpp" , "src/mongo/db/durop.cpp" , "src/mongo/db/dur_writetodatafiles.cpp" , "src/mongo/db/dur_preplogbuffer.cpp" , "src/mongo/db/dur_commitjob.cpp" , "src/mongo/db/dur_recover.cpp" , "src/mongo/db/dur_journal.cpp" , "src/mongo/db/introspect.cpp" , "src/mongo/db/btree.cpp" , "src/mongo/db/clientcursor.cpp" , "src/mongo/db/tests.cpp" , "src/mongo/db/repl.cpp" , "src/mongo/db/repl/rs.cpp" , "src/mongo/db/repl/consensus.cpp" , "src/mongo/db/repl/rs_initiate.cpp" , "src/mongo/db/repl/replset_commands.cpp" , "src/mongo/db/repl/manager.cpp" , "src/mongo/db/repl/health.cpp" , "src/mongo/db/repl/heartbeat.cpp" , "src/mongo/db/repl/rs_config.cpp" , "src/mongo/db/repl/rs_rollback.cpp" , "src/mongo/db/repl/rs_sync.cpp" , "src/mongo/db/repl/rs_initialsync.cpp" , "src/mongo/db/oplog.cpp" , "src/mongo/db/repl_block.cpp" , "src/mongo/db/btreecursor.cpp" , "src/mongo/db/cloner.cpp" , "src/mongo/db/namespace.cpp" , "src/mongo/db/cap.cpp" , "src/mongo/db/matcher_covered.cpp" , "src/mongo/db/dbeval.cpp" , "src/mongo/db/restapi.cpp" , "src/mongo/db/dbhelpers.cpp" , "src/mongo/db/instance.cpp" , "src/mongo/db/client.cpp" , "src/mongo/db/database.cpp" , "src/mongo/db/pdfile.cpp" , "src/mongo/db/record.cpp" , "src/mongo/db/cursor.cpp" , "src/mongo/db/security.cpp" , "src/mongo/db/queryoptimizer.cpp" , "src/mongo/db/queryoptimizercursor.cpp" , "src/mongo/db/extsort.cpp" , "src/mongo/db/cmdline.cpp" ]
 
-serverOnlyFiles += [ "db/index.cpp" , "db/scanandorder.cpp" ] + Glob( "db/geo/*.cpp" ) + Glob( "db/ops/*.cpp" )
+serverOnlyFiles += [ "src/mongo/db/index.cpp" , "src/mongo/db/scanandorder.cpp" ] + Glob( "src/mongo/db/geo/*.cpp" ) + Glob( "src/mongo/db/ops/*.cpp" )
 
-serverOnlyFiles += [ "db/dbcommands.cpp" , "db/dbcommands_admin.cpp" ]
+serverOnlyFiles += [ "src/mongo/db/dbcommands.cpp" , "src/mongo/db/dbcommands_admin.cpp" ]
 
 # most commands are only for mongod
 serverOnlyFiles += [
-    "db/commands/distinct.cpp",
-    "db/commands/find_and_modify.cpp",
-    "db/commands/group.cpp",
-    "db/commands/mr.cpp",
-    "db/commands/pipeline_command.cpp",
-    "db/commands/document_source_cursor.cpp" ]
-#    "db/commands/isself.cpp",
-#serverOnlyFiles += [ "db/commands/%s.cpp" % x for x in ["distinct","find_and_modify","group","mr"] ]
+    "src/mongo/db/commands/distinct.cpp",
+    "src/mongo/db/commands/find_and_modify.cpp",
+    "src/mongo/db/commands/group.cpp",
+    "src/mongo/db/commands/mr.cpp",
+    "src/mongo/db/commands/pipeline_command.cpp",
+    "src/mongo/db/commands/document_source_cursor.cpp" ]
+#    "src/mongo/db/commands/isself.cpp",
+#serverOnlyFiles += [ "src/mongo/db/commands/%s.cpp" % x for x in ["distinct","find_and_modify","group","mr"] ]
 
-serverOnlyFiles += [ "db/driverHelpers.cpp" ]
+serverOnlyFiles += [ "src/mongo/db/driverHelpers.cpp" ]
 
 serverOnlyFiles += mmapFiles
 
 # but the pipeline command works everywhere
-coreServerFiles += [ "db/commands/pipeline.cpp" ]
-coreServerFiles += Glob("db/pipeline/*.cpp")
+coreServerFiles += [ "src/mongo/db/commands/pipeline.cpp" ]
+coreServerFiles += Glob("src/mongo/db/pipeline/*.cpp")
 
-serverOnlyFiles += [ "db/stats/snapshots.cpp" ]
-############coreServerFiles += "db/stats/snapshots.cpp"
-coreServerFiles += [ "db/stats/counters.cpp", "db/stats/service_stats.cpp", "db/stats/top.cpp" ]
-#coreServerFiles += Glob( "db/stats/*.cpp" )
-coreServerFiles += [ "db/commands/isself.cpp", "db/security_common.cpp", "db/security_commands.cpp" ]
+serverOnlyFiles += [ "src/mongo/db/stats/snapshots.cpp" ]
+############coreServerFiles += "src/mongo/db/stats/snapshots.cpp"
+coreServerFiles += [ "src/mongo/db/stats/counters.cpp", "src/mongo/db/stats/service_stats.cpp", "src/mongo/db/stats/top.cpp" ]
+#coreServerFiles += Glob( "src/mongo/db/stats/*.cpp" )
+coreServerFiles += [ "src/mongo/db/commands/isself.cpp", "src/mongo/db/security_common.cpp", "src/mongo/db/security_commands.cpp" ]
 
-scriptingFiles = [ "scripting/engine.cpp" , "scripting/utils.cpp" , "scripting/bench.cpp" ]
+scriptingFiles = [ "src/mongo/scripting/engine.cpp" , "src/mongo/scripting/utils.cpp" , "src/mongo/scripting/bench.cpp" ]
 
 if usesm:
-    scriptingFiles += [ "scripting/engine_spidermonkey.cpp" ]
+    scriptingFiles += [ "src/mongo/scripting/engine_spidermonkey.cpp" ]
 elif usev8:
-    scriptingFiles += [ Glob( "scripting/*v8*.cpp" ) ]
+    scriptingFiles += [ Glob( "src/mongo/scripting/*v8*.cpp" ) ]
 else:
-    scriptingFiles += [ "scripting/engine_none.cpp" ]
+    scriptingFiles += [ "src/mongo/scripting/engine_none.cpp" ]
 
-coreShardFiles = [ "s/config.cpp" , "s/grid.cpp" , "s/chunk.cpp" , "s/shard.cpp" , "s/shardkey.cpp" ]
-shardServerFiles = coreShardFiles + Glob( "s/strategy*.cpp" ) + [ "s/commands_admin.cpp" , "s/commands_public.cpp" , "s/request.cpp" , "s/client.cpp" , "s/cursors.cpp" ,  "s/server.cpp" , "s/config_migrate.cpp" , "s/s_only.cpp" , "s/stats.cpp" , "s/balance.cpp" , "s/balancer_policy.cpp" , "db/cmdline.cpp" , "s/writeback_listener.cpp" , "s/shard_version.cpp", "s/mr_shard.cpp", "s/security.cpp" ]
-serverOnlyFiles += coreShardFiles + [ "s/d_logic.cpp" , "s/d_writeback.cpp" , "s/d_migrate.cpp" , "s/d_state.cpp" , "s/d_split.cpp" , "client/distlock_test.cpp" , "s/d_chunk_manager.cpp", "s/default_version.cpp" ]
+coreShardFiles = [ "src/mongo/s/config.cpp" , "src/mongo/s/grid.cpp" , "src/mongo/s/chunk.cpp" , "src/mongo/s/shard.cpp" , "src/mongo/s/shardkey.cpp" ]
+shardServerFiles = coreShardFiles + Glob( "src/mongo/s/strategy*.cpp" ) + [ "src/mongo/s/commands_admin.cpp" , "src/mongo/s/commands_public.cpp" , "src/mongo/s/request.cpp" , "src/mongo/s/client.cpp" , "src/mongo/s/cursors.cpp" ,  "src/mongo/s/server.cpp" , "src/mongo/s/config_migrate.cpp" , "src/mongo/s/s_only.cpp" , "src/mongo/s/stats.cpp" , "src/mongo/s/balance.cpp" , "src/mongo/s/balancer_policy.cpp" , "src/mongo/db/cmdline.cpp" , "src/mongo/s/writeback_listener.cpp" , "src/mongo/s/shard_version.cpp", "src/mongo/s/mr_shard.cpp", "src/mongo/s/security.cpp" ]
+serverOnlyFiles += coreShardFiles + [ "src/mongo/s/d_logic.cpp" , "src/mongo/s/d_writeback.cpp" , "src/mongo/s/d_migrate.cpp" , "src/mongo/s/d_state.cpp" , "src/mongo/s/d_split.cpp" , "src/mongo/client/distlock_test.cpp" , "src/mongo/s/d_chunk_manager.cpp", "src/mongo/s/default_version.cpp" ]
 
-serverOnlyFiles += [ "db/module.cpp" ] + Glob( "db/modules/*.cpp" )
+serverOnlyFiles += [ "src/mongo/db/module.cpp" ] + Glob( "src/mongo/db/modules/*.cpp" )
 
 modules = []
 moduleNames = []
 
-for x in os.listdir( "db/modules/" ):
+for x in os.listdir( "src/mongo/db/modules/" ):
     if x.find( "." ) >= 0:
         continue
     print( "adding module: " + x )
     moduleNames.append( x )
-    modRoot = "db/modules/" + x + "/"
+    modRoot = "src/mongo/db/modules/" + x + "/"
 
     modBuildFile = modRoot + "build.py"
     myModule = None
@@ -475,7 +476,7 @@ for x in os.listdir( "db/modules/" ):
         serverOnlyFiles += Glob( modRoot + "src/*.cpp" )
 
 
-allClientFiles = commonFiles + coreDbFiles + [ "client/clientOnly.cpp" , "client/gridfs.cpp" ];
+allClientFiles = commonFiles + coreDbFiles + [ "src/mongo/client/clientOnly.cpp" , "src/mongo/client/gridfs.cpp" ];
 
 # ---- other build setup -----
 
@@ -790,9 +791,9 @@ if nix:
             Exit(1)
         env['Gch'] = env.Gch( [ "pch.h" ] )[0]
         env['GchSh'] = env.GchSh( [ "pch.h" ] )[0]
-    elif os.path.exists('pch.h.gch'):
+    elif os.path.exists( "src/mongo/pch.h.gch" ):
         print( "removing precompiled headers" )
-        os.unlink('pch.h.gch') # gcc uses the file if it exists
+        os.unlink( "src/mongo/pch.h.gch" ) # gcc uses the file if it exists
 
 if usev8:
     env.Prepend( CPPPATH=["../v8/include/"] )
@@ -822,8 +823,8 @@ if not windows:
 moduleFiles = {}
 for shortName in getThirdPartyShortNames():    
 
-    path = "third_party/%s.py" % shortName
-    myModule = imp.load_module( "third_party_%s" % shortName , open( path , "r" ) , path , ( ".py" , "r" , imp.PY_SOURCE ) )
+    path = "src/third_party/%s.py" % shortName
+    myModule = imp.load_module( "src/third_party_%s" % shortName , open( path , "r" ) , path , ( ".py" , "r" , imp.PY_SOURCE ) )
     fileLists = { "commonFiles" : commonFiles , "serverOnlyFiles" : serverOnlyFiles , "scriptingFiles" : scriptingFiles, "moduleFiles" : moduleFiles }
     
     options_topass["windows"] = windows
@@ -874,7 +875,7 @@ def setupBuildInfoFile( outFile ):
     out.write( contents )
     out.close()
 
-setupBuildInfoFile( "buildinfo.cpp" )
+setupBuildInfoFile( "src/mongo/buildinfo.cpp" )
 
 def bigLibString( myenv ):
     s = str( myenv["LIBS"] )
@@ -1122,23 +1123,23 @@ def checkErrorCodes():
 checkErrorCodes()
 
 # main db target
-mongodOnlyFiles = [ "db/db.cpp", "db/compact.cpp" ]
+mongodOnlyFiles = [ "src/mongo/db/db.cpp", "src/mongo/db/compact.cpp" ]
 if windows:
-    mongodOnlyFiles.append( "util/ntservice.cpp" ) 
+    mongodOnlyFiles.append( "src/mongo/util/ntservice.cpp" ) 
 mongod = env.Program( "mongod" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + mongodOnlyFiles )
 Default( mongod )
 
 # tools
-allToolFiles = commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + [ "client/gridfs.cpp", "tools/tool.cpp" , "tools/stat_util.cpp" ]
+allToolFiles = commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + [ "src/mongo/client/gridfs.cpp", "src/mongo/tools/tool.cpp" , "src/mongo/tools/stat_util.cpp" ]
 normalTools = [ "dump" , "restore" , "export" , "import" , "files" , "stat" , "top" , "oplog" ]
 env.Alias( "tools" , [ add_exe( "mongo" + x ) for x in normalTools ] )
 for x in normalTools:
-    env.Program( "mongo" + x , allToolFiles + [ "tools/" + x + ".cpp" ] )
+    env.Program( "mongo" + x , allToolFiles + [ "src/mongo/tools/" + x + ".cpp" ] )
 
 #some special tools
-env.Program( "bsondump" , allToolFiles + [ "tools/bsondump.cpp" ] )
-env.Program( "mongobridge" , allToolFiles + [ "tools/bridge.cpp" ] )
-env.Program( "mongoperf" , allToolFiles + [ "client/examples/mongoperf.cpp" ] )
+env.Program( "bsondump" , allToolFiles + [ "src/mongo/tools/bsondump.cpp" ] )
+env.Program( "mongobridge" , allToolFiles + [ "src/mongo/tools/bridge.cpp" ] )
+env.Program( "mongoperf" , allToolFiles + [ "src/mongo/client/examples/mongoperf.cpp" ] )
 
 # mongos
 mongos = env.Program( "mongos" , commonFiles + coreDbFiles + coreServerFiles + shardServerFiles )
@@ -1148,7 +1149,7 @@ clientLib = env.Library( "mongoclient" , allClientFiles )
 clientLibName = str( clientLib[0] )
 if has_option( "sharedclient" ):
     sharedClientLibName = str( env.SharedLibrary( "mongoclient" , allClientFiles )[0] )
-env.Library( "mongotestfiles" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + ["client/gridfs.cpp"])
+env.Library( "mongotestfiles" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + ["src/mongo/client/gridfs.cpp"])
 env.Library( "mongoshellfiles" , allClientFiles + coreServerFiles )
 
 clientEnv = env.Clone();
@@ -1161,20 +1162,20 @@ l = clientEnv[ "LIBS" ]
 clientTests = []
 
 # examples
-clientTests += [ clientEnv.Program( "firstExample" , [ "client/examples/first.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "rsExample" , [ "client/examples/rs.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "secondExample" , [ "client/examples/second.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "whereExample" , [ "client/examples/whereExample.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "authTest" , [ "client/examples/authTest.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "httpClientTest" , [ "client/examples/httpClientTest.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "bsondemo" , [ "bson/bsondemo/bsondemo.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "firstExample" , [ "src/mongo/client/examples/first.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "rsExample" , [ "src/mongo/client/examples/rs.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "secondExample" , [ "src/mongo/client/examples/second.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "whereExample" , [ "src/mongo/client/examples/whereExample.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "authTest" , [ "src/mongo/client/examples/authTest.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "httpClientTest" , [ "src/mongo/client/examples/httpClientTest.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "bsondemo" , [ "src/mongo/bson/bsondemo/bsondemo.cpp" ] ) ]
 
 # dbtests test binary
-test = testEnv.Program( "test" , Glob( "dbtests/*.cpp" ) )
+test = testEnv.Program( "test" , Glob( "src/mongo/dbtests/*.cpp" ) )
 if windows:
     testEnv.Alias( "test" , "test.exe" )
-perftest = testEnv.Program( "perftest", [ "dbtests/framework.cpp" , "dbtests/perf/perftest.cpp" ] )
-clientTests += [ clientEnv.Program( "clientTest" , [ "client/examples/clientTest.cpp" ] ) ]
+perftest = testEnv.Program( "perftest", [ "src/mongo/dbtests/framework.cpp" , "src/mongo/dbtests/perf/perftest.cpp" ] )
+clientTests += [ clientEnv.Program( "clientTest" , [ "src/mongo/client/examples/clientTest.cpp" ] ) ]
 
 # --- sniffer ---
 mongosniff_built = False
@@ -1191,14 +1192,14 @@ if darwin or clientEnv["_HAVEPCAP"]:
     sniffEnv.Prepend( LIBPATH=["."] )
     sniffEnv.Prepend( LIBS=[ "mongotestfiles" ] )
 
-    sniffEnv.Program( "mongosniff" , "tools/sniffer.cpp" )
+    sniffEnv.Program( "mongosniff" , "src/mongo/tools/sniffer.cpp" )
 
 # --- shell ---
 
 # note, if you add a file here, you need to add it in scripting/engine.cpp and shell/msvc/createCPPfromJavaScriptFiles.js as well
-env.JSHeader( "shell/mongo.cpp"  , Glob( "shell/utils*.js" ) + [ "shell/db.js","shell/mongo.js","shell/mr.js","shell/query.js","shell/collection.js"] )
+env.JSHeader( "src/mongo/shell/mongo.cpp"  , Glob( "src/mongo/shell/utils*.js" ) + [ "src/mongo/shell/db.js","src/mongo/shell/mongo.js","src/mongo/shell/mr.js","src/mongo/shell/query.js","src/mongo/shell/collection.js"] )
 
-env.JSHeader( "shell/mongo-server.cpp"  , [ "shell/servers.js"] )
+env.JSHeader( "src/mongo/shell/mongo-server.cpp"  , [ "src/mongo/shell/servers.js"] )
 
 shellEnv = env.Clone();
 
@@ -1215,9 +1216,9 @@ elif not onlyServer:
     if windows:
         shellEnv.Append( LIBS=["winmm.lib"] )
 
-    coreShellFiles = [ "shell/dbshell.cpp" , "shell/shell_utils.cpp" , "shell/mongo-server.cpp" ]
+    coreShellFiles = [ "src/mongo/shell/dbshell.cpp" , "src/mongo/shell/shell_utils.cpp" , "src/mongo/shell/mongo-server.cpp" ]
 
-    coreShellFiles.append( "third_party/linenoise/linenoise.cpp" )
+    coreShellFiles.append( "src/third_party/linenoise/linenoise.cpp" )
 
     shellEnv.Prepend( LIBPATH=[ "." ] )
         
@@ -1424,7 +1425,7 @@ def getSystemInstallName():
     return n
 
 def getCodeVersion():
-    fullSource = open( "util/version.cpp" , "r" ).read()
+    fullSource = open( "src/mongo/util/version.cpp" , "r" ).read()
     allMatches = re.findall( r"versionString.. = \"(.*?)\"" , fullSource );
     if len(allMatches) != 1:
         print( "can't find version # in code" )
@@ -1518,7 +1519,7 @@ env.Alias( "core" , [ add_exe( "mongo" ) , add_exe( "mongod" ) , add_exe( "mongo
 
 #headers
 if installSetup.headers:
-    for id in [ "", "util/", "util/net/", "util/mongoutils/", "util/concurrency/", "db/" , "db/stats/" , "db/repl/" , "db/ops/" , "client/" , "bson/", "bson/util/" , "s/" , "scripting/" ]:
+    for id in [ "src/mongo/" , "src/mongo/util/", "src/mongo/util/net/", "src/mongo/util/mongoutils/", "src/mongo/util/concurrency/", "src/mongo/db/" , "src/mongo/db/stats/" , "src/mongo/db/repl/" , "src/mongo/db/ops/" , "src/mongo/client/" , "src/mongo/bson/", "src/mongo/bson/util/" , "src/mongo/s/" , "src/mongo/scripting/" ]:
         env.Install( installDir + "/" + installSetup.headerRoot + "/mongo/" + id , Glob( id + "*.h" ) )
         env.Install( installDir + "/" + installSetup.headerRoot + "/mongo/" + id , Glob( id + "*.hpp" ) )
 
diff --git a/speed.js b/speed.js
deleted file mode 100755
index c5aa3a36964..00000000000
--- a/speed.js
+++ /dev/null
@@ -1,13 +0,0 @@
-t = db.fooo;
-t.drop();
-x = { str:'aaaabbbbcc' }
-s = new Date();
-for( var i = 0; i < 100000; i++ ) { 
-    x.i = i;
-    t.insert(x);
-}
-print( (new Date())-s );
-t.ensureIndex({x:1});
-t.ensureIndex({str:1});
-print( (new Date())-s );
-
diff --git a/bson/README b/src/mongo/bson/README
similarity index 100%
rename from bson/README
rename to src/mongo/bson/README
diff --git a/bson/bson-inl.h b/src/mongo/bson/bson-inl.h
similarity index 100%
rename from bson/bson-inl.h
rename to src/mongo/bson/bson-inl.h
diff --git a/bson/bson.h b/src/mongo/bson/bson.h
similarity index 100%
rename from bson/bson.h
rename to src/mongo/bson/bson.h
diff --git a/bson/bson_db.h b/src/mongo/bson/bson_db.h
similarity index 100%
rename from bson/bson_db.h
rename to src/mongo/bson/bson_db.h
diff --git a/bson/bsondemo/bsondemo.cpp b/src/mongo/bson/bsondemo/bsondemo.cpp
similarity index 100%
rename from bson/bsondemo/bsondemo.cpp
rename to src/mongo/bson/bsondemo/bsondemo.cpp
diff --git a/bson/bsondemo/bsondemo.vcproj b/src/mongo/bson/bsondemo/bsondemo.vcproj
similarity index 100%
rename from bson/bsondemo/bsondemo.vcproj
rename to src/mongo/bson/bsondemo/bsondemo.vcproj
diff --git a/bson/bsondemo/bsondemo.vcxproj b/src/mongo/bson/bsondemo/bsondemo.vcxproj
similarity index 100%
rename from bson/bsondemo/bsondemo.vcxproj
rename to src/mongo/bson/bsondemo/bsondemo.vcxproj
diff --git a/bson/bsondemo/bsondemo.vcxproj.filters b/src/mongo/bson/bsondemo/bsondemo.vcxproj.filters
similarity index 100%
rename from bson/bsondemo/bsondemo.vcxproj.filters
rename to src/mongo/bson/bsondemo/bsondemo.vcxproj.filters
diff --git a/bson/bsonelement.h b/src/mongo/bson/bsonelement.h
similarity index 100%
rename from bson/bsonelement.h
rename to src/mongo/bson/bsonelement.h
diff --git a/bson/bsonmisc.h b/src/mongo/bson/bsonmisc.h
similarity index 100%
rename from bson/bsonmisc.h
rename to src/mongo/bson/bsonmisc.h
diff --git a/bson/bsonobj.h b/src/mongo/bson/bsonobj.h
similarity index 100%
rename from bson/bsonobj.h
rename to src/mongo/bson/bsonobj.h
diff --git a/bson/bsonobjbuilder.h b/src/mongo/bson/bsonobjbuilder.h
similarity index 100%
rename from bson/bsonobjbuilder.h
rename to src/mongo/bson/bsonobjbuilder.h
diff --git a/bson/bsonobjiterator.h b/src/mongo/bson/bsonobjiterator.h
similarity index 100%
rename from bson/bsonobjiterator.h
rename to src/mongo/bson/bsonobjiterator.h
diff --git a/bson/bsontypes.h b/src/mongo/bson/bsontypes.h
similarity index 100%
rename from bson/bsontypes.h
rename to src/mongo/bson/bsontypes.h
diff --git a/bson/inline_decls.h b/src/mongo/bson/inline_decls.h
similarity index 100%
rename from bson/inline_decls.h
rename to src/mongo/bson/inline_decls.h
diff --git a/bson/oid.cpp b/src/mongo/bson/oid.cpp
similarity index 100%
rename from bson/oid.cpp
rename to src/mongo/bson/oid.cpp
diff --git a/bson/oid.h b/src/mongo/bson/oid.h
similarity index 100%
rename from bson/oid.h
rename to src/mongo/bson/oid.h
diff --git a/bson/ordering.h b/src/mongo/bson/ordering.h
similarity index 100%
rename from bson/ordering.h
rename to src/mongo/bson/ordering.h
diff --git a/bson/stringdata.h b/src/mongo/bson/stringdata.h
similarity index 100%
rename from bson/stringdata.h
rename to src/mongo/bson/stringdata.h
diff --git a/bson/util/atomic_int.h b/src/mongo/bson/util/atomic_int.h
similarity index 100%
rename from bson/util/atomic_int.h
rename to src/mongo/bson/util/atomic_int.h
diff --git a/bson/util/builder.h b/src/mongo/bson/util/builder.h
similarity index 100%
rename from bson/util/builder.h
rename to src/mongo/bson/util/builder.h
diff --git a/bson/util/misc.h b/src/mongo/bson/util/misc.h
similarity index 100%
rename from bson/util/misc.h
rename to src/mongo/bson/util/misc.h
diff --git a/client/clientOnly.cpp b/src/mongo/client/clientOnly.cpp
similarity index 100%
rename from client/clientOnly.cpp
rename to src/mongo/client/clientOnly.cpp
diff --git a/client/connpool.cpp b/src/mongo/client/connpool.cpp
similarity index 100%
rename from client/connpool.cpp
rename to src/mongo/client/connpool.cpp
diff --git a/client/connpool.h b/src/mongo/client/connpool.h
similarity index 100%
rename from client/connpool.h
rename to src/mongo/client/connpool.h
diff --git a/client/constants.h b/src/mongo/client/constants.h
similarity index 100%
rename from client/constants.h
rename to src/mongo/client/constants.h
diff --git a/client/dbclient.cpp b/src/mongo/client/dbclient.cpp
similarity index 100%
rename from client/dbclient.cpp
rename to src/mongo/client/dbclient.cpp
diff --git a/client/dbclient.h b/src/mongo/client/dbclient.h
similarity index 100%
rename from client/dbclient.h
rename to src/mongo/client/dbclient.h
diff --git a/client/dbclient_rs.cpp b/src/mongo/client/dbclient_rs.cpp
similarity index 100%
rename from client/dbclient_rs.cpp
rename to src/mongo/client/dbclient_rs.cpp
diff --git a/client/dbclient_rs.h b/src/mongo/client/dbclient_rs.h
similarity index 100%
rename from client/dbclient_rs.h
rename to src/mongo/client/dbclient_rs.h
diff --git a/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp
similarity index 100%
rename from client/dbclientcursor.cpp
rename to src/mongo/client/dbclientcursor.cpp
diff --git a/client/dbclientcursor.h b/src/mongo/client/dbclientcursor.h
similarity index 100%
rename from client/dbclientcursor.h
rename to src/mongo/client/dbclientcursor.h
diff --git a/client/dbclientmockcursor.h b/src/mongo/client/dbclientmockcursor.h
similarity index 100%
rename from client/dbclientmockcursor.h
rename to src/mongo/client/dbclientmockcursor.h
diff --git a/client/distlock.cpp b/src/mongo/client/distlock.cpp
similarity index 100%
rename from client/distlock.cpp
rename to src/mongo/client/distlock.cpp
diff --git a/client/distlock.h b/src/mongo/client/distlock.h
similarity index 100%
rename from client/distlock.h
rename to src/mongo/client/distlock.h
diff --git a/client/distlock_test.cpp b/src/mongo/client/distlock_test.cpp
similarity index 100%
rename from client/distlock_test.cpp
rename to src/mongo/client/distlock_test.cpp
diff --git a/client/examples/authTest.cpp b/src/mongo/client/examples/authTest.cpp
similarity index 100%
rename from client/examples/authTest.cpp
rename to src/mongo/client/examples/authTest.cpp
diff --git a/client/examples/clientTest.cpp b/src/mongo/client/examples/clientTest.cpp
similarity index 100%
rename from client/examples/clientTest.cpp
rename to src/mongo/client/examples/clientTest.cpp
diff --git a/client/examples/first.cpp b/src/mongo/client/examples/first.cpp
similarity index 100%
rename from client/examples/first.cpp
rename to src/mongo/client/examples/first.cpp
diff --git a/client/examples/httpClientTest.cpp b/src/mongo/client/examples/httpClientTest.cpp
similarity index 100%
rename from client/examples/httpClientTest.cpp
rename to src/mongo/client/examples/httpClientTest.cpp
diff --git a/client/examples/insert_demo.cpp b/src/mongo/client/examples/insert_demo.cpp
similarity index 100%
rename from client/examples/insert_demo.cpp
rename to src/mongo/client/examples/insert_demo.cpp
diff --git a/client/examples/mongoperf.cpp b/src/mongo/client/examples/mongoperf.cpp
similarity index 100%
rename from client/examples/mongoperf.cpp
rename to src/mongo/client/examples/mongoperf.cpp
diff --git a/client/examples/mongoperf.vcxproj b/src/mongo/client/examples/mongoperf.vcxproj
similarity index 100%
rename from client/examples/mongoperf.vcxproj
rename to src/mongo/client/examples/mongoperf.vcxproj
diff --git a/client/examples/mongoperf.vcxproj.filters b/src/mongo/client/examples/mongoperf.vcxproj.filters
similarity index 100%
rename from client/examples/mongoperf.vcxproj.filters
rename to src/mongo/client/examples/mongoperf.vcxproj.filters
diff --git a/client/examples/rs.cpp b/src/mongo/client/examples/rs.cpp
similarity index 100%
rename from client/examples/rs.cpp
rename to src/mongo/client/examples/rs.cpp
diff --git a/client/examples/second.cpp b/src/mongo/client/examples/second.cpp
similarity index 100%
rename from client/examples/second.cpp
rename to src/mongo/client/examples/second.cpp
diff --git a/client/examples/simple_client_demo.vcxproj b/src/mongo/client/examples/simple_client_demo.vcxproj
similarity index 100%
rename from client/examples/simple_client_demo.vcxproj
rename to src/mongo/client/examples/simple_client_demo.vcxproj
diff --git a/client/examples/simple_client_demo.vcxproj.filters b/src/mongo/client/examples/simple_client_demo.vcxproj.filters
similarity index 100%
rename from client/examples/simple_client_demo.vcxproj.filters
rename to src/mongo/client/examples/simple_client_demo.vcxproj.filters
diff --git a/client/examples/tail.cpp b/src/mongo/client/examples/tail.cpp
similarity index 100%
rename from client/examples/tail.cpp
rename to src/mongo/client/examples/tail.cpp
diff --git a/client/examples/tutorial.cpp b/src/mongo/client/examples/tutorial.cpp
similarity index 100%
rename from client/examples/tutorial.cpp
rename to src/mongo/client/examples/tutorial.cpp
diff --git a/client/examples/whereExample.cpp b/src/mongo/client/examples/whereExample.cpp
similarity index 100%
rename from client/examples/whereExample.cpp
rename to src/mongo/client/examples/whereExample.cpp
diff --git a/client/gridfs.cpp b/src/mongo/client/gridfs.cpp
similarity index 100%
rename from client/gridfs.cpp
rename to src/mongo/client/gridfs.cpp
diff --git a/client/gridfs.h b/src/mongo/client/gridfs.h
similarity index 100%
rename from client/gridfs.h
rename to src/mongo/client/gridfs.h
diff --git a/client/model.cpp b/src/mongo/client/model.cpp
similarity index 100%
rename from client/model.cpp
rename to src/mongo/client/model.cpp
diff --git a/client/model.h b/src/mongo/client/model.h
similarity index 100%
rename from client/model.h
rename to src/mongo/client/model.h
diff --git a/client/mongo_client_lib.cpp b/src/mongo/client/mongo_client_lib.cpp
similarity index 100%
rename from client/mongo_client_lib.cpp
rename to src/mongo/client/mongo_client_lib.cpp
diff --git a/client/parallel.cpp b/src/mongo/client/parallel.cpp
similarity index 100%
rename from client/parallel.cpp
rename to src/mongo/client/parallel.cpp
diff --git a/client/parallel.h b/src/mongo/client/parallel.h
similarity index 100%
rename from client/parallel.h
rename to src/mongo/client/parallel.h
diff --git a/client/redef_macros.h b/src/mongo/client/redef_macros.h
similarity index 100%
rename from client/redef_macros.h
rename to src/mongo/client/redef_macros.h
diff --git a/client/simple_client_demo.cpp b/src/mongo/client/simple_client_demo.cpp
similarity index 100%
rename from client/simple_client_demo.cpp
rename to src/mongo/client/simple_client_demo.cpp
diff --git a/client/syncclusterconnection.cpp b/src/mongo/client/syncclusterconnection.cpp
similarity index 100%
rename from client/syncclusterconnection.cpp
rename to src/mongo/client/syncclusterconnection.cpp
diff --git a/client/syncclusterconnection.h b/src/mongo/client/syncclusterconnection.h
similarity index 100%
rename from client/syncclusterconnection.h
rename to src/mongo/client/syncclusterconnection.h
diff --git a/client/undef_macros.h b/src/mongo/client/undef_macros.h
similarity index 100%
rename from client/undef_macros.h
rename to src/mongo/client/undef_macros.h
diff --git a/db/background.h b/src/mongo/db/background.h
similarity index 100%
rename from db/background.h
rename to src/mongo/db/background.h
diff --git a/db/btree.cpp b/src/mongo/db/btree.cpp
similarity index 100%
rename from db/btree.cpp
rename to src/mongo/db/btree.cpp
diff --git a/db/btree.h b/src/mongo/db/btree.h
similarity index 100%
rename from db/btree.h
rename to src/mongo/db/btree.h
diff --git a/db/btreebuilder.cpp b/src/mongo/db/btreebuilder.cpp
similarity index 100%
rename from db/btreebuilder.cpp
rename to src/mongo/db/btreebuilder.cpp
diff --git a/db/btreebuilder.h b/src/mongo/db/btreebuilder.h
similarity index 100%
rename from db/btreebuilder.h
rename to src/mongo/db/btreebuilder.h
diff --git a/db/btreecursor.cpp b/src/mongo/db/btreecursor.cpp
similarity index 100%
rename from db/btreecursor.cpp
rename to src/mongo/db/btreecursor.cpp
diff --git a/db/cap.cpp b/src/mongo/db/cap.cpp
similarity index 100%
rename from db/cap.cpp
rename to src/mongo/db/cap.cpp
diff --git a/db/client.cpp b/src/mongo/db/client.cpp
similarity index 100%
rename from db/client.cpp
rename to src/mongo/db/client.cpp
diff --git a/db/client.h b/src/mongo/db/client.h
similarity index 100%
rename from db/client.h
rename to src/mongo/db/client.h
diff --git a/db/client_common.h b/src/mongo/db/client_common.h
similarity index 100%
rename from db/client_common.h
rename to src/mongo/db/client_common.h
diff --git a/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
similarity index 100%
rename from db/clientcursor.cpp
rename to src/mongo/db/clientcursor.cpp
diff --git a/db/clientcursor.h b/src/mongo/db/clientcursor.h
similarity index 100%
rename from db/clientcursor.h
rename to src/mongo/db/clientcursor.h
diff --git a/db/cloner.cpp b/src/mongo/db/cloner.cpp
similarity index 100%
rename from db/cloner.cpp
rename to src/mongo/db/cloner.cpp
diff --git a/db/cloner.h b/src/mongo/db/cloner.h
similarity index 100%
rename from db/cloner.h
rename to src/mongo/db/cloner.h
diff --git a/db/cmdline.cpp b/src/mongo/db/cmdline.cpp
similarity index 100%
rename from db/cmdline.cpp
rename to src/mongo/db/cmdline.cpp
diff --git a/db/cmdline.h b/src/mongo/db/cmdline.h
similarity index 100%
rename from db/cmdline.h
rename to src/mongo/db/cmdline.h
diff --git a/db/collection.h b/src/mongo/db/collection.h
similarity index 100%
rename from db/collection.h
rename to src/mongo/db/collection.h
diff --git a/db/commands.cpp b/src/mongo/db/commands.cpp
similarity index 100%
rename from db/commands.cpp
rename to src/mongo/db/commands.cpp
diff --git a/db/commands.h b/src/mongo/db/commands.h
similarity index 100%
rename from db/commands.h
rename to src/mongo/db/commands.h
diff --git a/db/commands/aggregate.js b/src/mongo/db/commands/aggregate.js
similarity index 100%
rename from db/commands/aggregate.js
rename to src/mongo/db/commands/aggregate.js
diff --git a/db/commands/cloud.cpp b/src/mongo/db/commands/cloud.cpp
similarity index 100%
rename from db/commands/cloud.cpp
rename to src/mongo/db/commands/cloud.cpp
diff --git a/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp
similarity index 100%
rename from db/commands/distinct.cpp
rename to src/mongo/db/commands/distinct.cpp
diff --git a/db/commands/document_source_cursor.cpp b/src/mongo/db/commands/document_source_cursor.cpp
similarity index 100%
rename from db/commands/document_source_cursor.cpp
rename to src/mongo/db/commands/document_source_cursor.cpp
diff --git a/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
similarity index 100%
rename from db/commands/find_and_modify.cpp
rename to src/mongo/db/commands/find_and_modify.cpp
diff --git a/db/commands/group.cpp b/src/mongo/db/commands/group.cpp
similarity index 100%
rename from db/commands/group.cpp
rename to src/mongo/db/commands/group.cpp
diff --git a/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp
similarity index 100%
rename from db/commands/isself.cpp
rename to src/mongo/db/commands/isself.cpp
diff --git a/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
similarity index 100%
rename from db/commands/mr.cpp
rename to src/mongo/db/commands/mr.cpp
diff --git a/db/commands/mr.h b/src/mongo/db/commands/mr.h
similarity index 100%
rename from db/commands/mr.h
rename to src/mongo/db/commands/mr.h
diff --git a/db/commands/pipeline.cpp b/src/mongo/db/commands/pipeline.cpp
similarity index 100%
rename from db/commands/pipeline.cpp
rename to src/mongo/db/commands/pipeline.cpp
diff --git a/db/commands/pipeline.h b/src/mongo/db/commands/pipeline.h
similarity index 100%
rename from db/commands/pipeline.h
rename to src/mongo/db/commands/pipeline.h
diff --git a/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
similarity index 100%
rename from db/commands/pipeline_command.cpp
rename to src/mongo/db/commands/pipeline_command.cpp
diff --git a/db/common.cpp b/src/mongo/db/common.cpp
similarity index 100%
rename from db/common.cpp
rename to src/mongo/db/common.cpp
diff --git a/db/compact.cpp b/src/mongo/db/compact.cpp
similarity index 100%
rename from db/compact.cpp
rename to src/mongo/db/compact.cpp
diff --git a/db/compact.h b/src/mongo/db/compact.h
similarity index 100%
rename from db/compact.h
rename to src/mongo/db/compact.h
diff --git a/db/concurrency.h b/src/mongo/db/concurrency.h
similarity index 100%
rename from db/concurrency.h
rename to src/mongo/db/concurrency.h
diff --git a/db/curop-inl.h b/src/mongo/db/curop-inl.h
similarity index 100%
rename from db/curop-inl.h
rename to src/mongo/db/curop-inl.h
diff --git a/db/curop.cpp b/src/mongo/db/curop.cpp
similarity index 100%
rename from db/curop.cpp
rename to src/mongo/db/curop.cpp
diff --git a/db/curop.h b/src/mongo/db/curop.h
similarity index 100%
rename from db/curop.h
rename to src/mongo/db/curop.h
diff --git a/db/cursor.cpp b/src/mongo/db/cursor.cpp
similarity index 100%
rename from db/cursor.cpp
rename to src/mongo/db/cursor.cpp
diff --git a/db/cursor.h b/src/mongo/db/cursor.h
similarity index 100%
rename from db/cursor.h
rename to src/mongo/db/cursor.h
diff --git a/db/d_concurrency.cpp b/src/mongo/db/d_concurrency.cpp
similarity index 100%
rename from db/d_concurrency.cpp
rename to src/mongo/db/d_concurrency.cpp
diff --git a/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
similarity index 100%
rename from db/d_concurrency.h
rename to src/mongo/db/d_concurrency.h
diff --git a/db/d_globals.cpp b/src/mongo/db/d_globals.cpp
similarity index 100%
rename from db/d_globals.cpp
rename to src/mongo/db/d_globals.cpp
diff --git a/db/d_globals.h b/src/mongo/db/d_globals.h
similarity index 100%
rename from db/d_globals.h
rename to src/mongo/db/d_globals.h
diff --git a/db/database.cpp b/src/mongo/db/database.cpp
similarity index 100%
rename from db/database.cpp
rename to src/mongo/db/database.cpp
diff --git a/db/database.h b/src/mongo/db/database.h
similarity index 100%
rename from db/database.h
rename to src/mongo/db/database.h
diff --git a/db/databaseholder.h b/src/mongo/db/databaseholder.h
similarity index 100%
rename from db/databaseholder.h
rename to src/mongo/db/databaseholder.h
diff --git a/db/db.cpp b/src/mongo/db/db.cpp
similarity index 100%
rename from db/db.cpp
rename to src/mongo/db/db.cpp
diff --git a/db/db.h b/src/mongo/db/db.h
similarity index 100%
rename from db/db.h
rename to src/mongo/db/db.h
diff --git a/db/db.rc b/src/mongo/db/db.rc
similarity index 100%
rename from db/db.rc
rename to src/mongo/db/db.rc
diff --git a/db/db.vcxproj b/src/mongo/db/db.vcxproj
similarity index 100%
rename from db/db.vcxproj
rename to src/mongo/db/db.vcxproj
diff --git a/db/db.vcxproj.filters b/src/mongo/db/db.vcxproj.filters
similarity index 100%
rename from db/db.vcxproj.filters
rename to src/mongo/db/db.vcxproj.filters
diff --git a/db/db_10.sln b/src/mongo/db/db_10.sln
similarity index 100%
rename from db/db_10.sln
rename to src/mongo/db/db_10.sln
diff --git a/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
similarity index 100%
rename from db/dbcommands.cpp
rename to src/mongo/db/dbcommands.cpp
diff --git a/db/dbcommands_admin.cpp b/src/mongo/db/dbcommands_admin.cpp
similarity index 100%
rename from db/dbcommands_admin.cpp
rename to src/mongo/db/dbcommands_admin.cpp
diff --git a/db/dbcommands_generic.cpp b/src/mongo/db/dbcommands_generic.cpp
similarity index 100%
rename from db/dbcommands_generic.cpp
rename to src/mongo/db/dbcommands_generic.cpp
diff --git a/db/dbeval.cpp b/src/mongo/db/dbeval.cpp
similarity index 100%
rename from db/dbeval.cpp
rename to src/mongo/db/dbeval.cpp
diff --git a/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp
similarity index 100%
rename from db/dbhelpers.cpp
rename to src/mongo/db/dbhelpers.cpp
diff --git a/db/dbhelpers.h b/src/mongo/db/dbhelpers.h
similarity index 100%
rename from db/dbhelpers.h
rename to src/mongo/db/dbhelpers.h
diff --git a/db/dbmessage.cpp b/src/mongo/db/dbmessage.cpp
similarity index 100%
rename from db/dbmessage.cpp
rename to src/mongo/db/dbmessage.cpp
diff --git a/db/dbmessage.h b/src/mongo/db/dbmessage.h
similarity index 100%
rename from db/dbmessage.h
rename to src/mongo/db/dbmessage.h
diff --git a/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
similarity index 100%
rename from db/dbwebserver.cpp
rename to src/mongo/db/dbwebserver.cpp
diff --git a/db/dbwebserver.h b/src/mongo/db/dbwebserver.h
similarity index 100%
rename from db/dbwebserver.h
rename to src/mongo/db/dbwebserver.h
diff --git a/db/diskloc.h b/src/mongo/db/diskloc.h
similarity index 100%
rename from db/diskloc.h
rename to src/mongo/db/diskloc.h
diff --git a/db/driverHelpers.cpp b/src/mongo/db/driverHelpers.cpp
similarity index 100%
rename from db/driverHelpers.cpp
rename to src/mongo/db/driverHelpers.cpp
diff --git a/db/dur.cpp b/src/mongo/db/dur.cpp
similarity index 100%
rename from db/dur.cpp
rename to src/mongo/db/dur.cpp
diff --git a/db/dur.h b/src/mongo/db/dur.h
similarity index 100%
rename from db/dur.h
rename to src/mongo/db/dur.h
diff --git a/db/dur_commitjob.cpp b/src/mongo/db/dur_commitjob.cpp
similarity index 100%
rename from db/dur_commitjob.cpp
rename to src/mongo/db/dur_commitjob.cpp
diff --git a/db/dur_commitjob.h b/src/mongo/db/dur_commitjob.h
similarity index 100%
rename from db/dur_commitjob.h
rename to src/mongo/db/dur_commitjob.h
diff --git a/db/dur_journal.cpp b/src/mongo/db/dur_journal.cpp
similarity index 100%
rename from db/dur_journal.cpp
rename to src/mongo/db/dur_journal.cpp
diff --git a/db/dur_journal.h b/src/mongo/db/dur_journal.h
similarity index 100%
rename from db/dur_journal.h
rename to src/mongo/db/dur_journal.h
diff --git a/db/dur_journalformat.h b/src/mongo/db/dur_journalformat.h
similarity index 100%
rename from db/dur_journalformat.h
rename to src/mongo/db/dur_journalformat.h
diff --git a/db/dur_journalimpl.h b/src/mongo/db/dur_journalimpl.h
similarity index 100%
rename from db/dur_journalimpl.h
rename to src/mongo/db/dur_journalimpl.h
diff --git a/db/dur_preplogbuffer.cpp b/src/mongo/db/dur_preplogbuffer.cpp
similarity index 100%
rename from db/dur_preplogbuffer.cpp
rename to src/mongo/db/dur_preplogbuffer.cpp
diff --git a/db/dur_recover.cpp b/src/mongo/db/dur_recover.cpp
similarity index 100%
rename from db/dur_recover.cpp
rename to src/mongo/db/dur_recover.cpp
diff --git a/db/dur_recover.h b/src/mongo/db/dur_recover.h
similarity index 100%
rename from db/dur_recover.h
rename to src/mongo/db/dur_recover.h
diff --git a/db/dur_stats.h b/src/mongo/db/dur_stats.h
similarity index 100%
rename from db/dur_stats.h
rename to src/mongo/db/dur_stats.h
diff --git a/db/dur_writetodatafiles.cpp b/src/mongo/db/dur_writetodatafiles.cpp
similarity index 100%
rename from db/dur_writetodatafiles.cpp
rename to src/mongo/db/dur_writetodatafiles.cpp
diff --git a/db/durop.cpp b/src/mongo/db/durop.cpp
similarity index 100%
rename from db/durop.cpp
rename to src/mongo/db/durop.cpp
diff --git a/db/durop.h b/src/mongo/db/durop.h
similarity index 100%
rename from db/durop.h
rename to src/mongo/db/durop.h
diff --git a/db/extsort.cpp b/src/mongo/db/extsort.cpp
similarity index 100%
rename from db/extsort.cpp
rename to src/mongo/db/extsort.cpp
diff --git a/db/extsort.h b/src/mongo/db/extsort.h
similarity index 100%
rename from db/extsort.h
rename to src/mongo/db/extsort.h
diff --git a/db/filever.h b/src/mongo/db/filever.h
similarity index 100%
rename from db/filever.h
rename to src/mongo/db/filever.h
diff --git a/db/flushtest.cpp b/src/mongo/db/flushtest.cpp
similarity index 100%
rename from db/flushtest.cpp
rename to src/mongo/db/flushtest.cpp
diff --git a/db/geo/2d.cpp b/src/mongo/db/geo/2d.cpp
similarity index 100%
rename from db/geo/2d.cpp
rename to src/mongo/db/geo/2d.cpp
diff --git a/db/geo/core.h b/src/mongo/db/geo/core.h
similarity index 100%
rename from db/geo/core.h
rename to src/mongo/db/geo/core.h
diff --git a/db/geo/haystack.cpp b/src/mongo/db/geo/haystack.cpp
similarity index 100%
rename from db/geo/haystack.cpp
rename to src/mongo/db/geo/haystack.cpp
diff --git a/db/globals.h b/src/mongo/db/globals.h
similarity index 100%
rename from db/globals.h
rename to src/mongo/db/globals.h
diff --git a/db/helpers/dblogger.h b/src/mongo/db/helpers/dblogger.h
similarity index 100%
rename from db/helpers/dblogger.h
rename to src/mongo/db/helpers/dblogger.h
diff --git a/db/index.cpp b/src/mongo/db/index.cpp
similarity index 100%
rename from db/index.cpp
rename to src/mongo/db/index.cpp
diff --git a/db/index.h b/src/mongo/db/index.h
similarity index 100%
rename from db/index.h
rename to src/mongo/db/index.h
diff --git a/db/indexkey.cpp b/src/mongo/db/indexkey.cpp
similarity index 100%
rename from db/indexkey.cpp
rename to src/mongo/db/indexkey.cpp
diff --git a/db/indexkey.h b/src/mongo/db/indexkey.h
similarity index 100%
rename from db/indexkey.h
rename to src/mongo/db/indexkey.h
diff --git a/db/instance.cpp b/src/mongo/db/instance.cpp
similarity index 100%
rename from db/instance.cpp
rename to src/mongo/db/instance.cpp
diff --git a/db/instance.h b/src/mongo/db/instance.h
similarity index 100%
rename from db/instance.h
rename to src/mongo/db/instance.h
diff --git a/db/introspect.cpp b/src/mongo/db/introspect.cpp
similarity index 100%
rename from db/introspect.cpp
rename to src/mongo/db/introspect.cpp
diff --git a/db/introspect.h b/src/mongo/db/introspect.h
similarity index 100%
rename from db/introspect.h
rename to src/mongo/db/introspect.h
diff --git a/db/javatest.cpp b/src/mongo/db/javatest.cpp
similarity index 100%
rename from db/javatest.cpp
rename to src/mongo/db/javatest.cpp
diff --git a/db/jsobj.cpp b/src/mongo/db/jsobj.cpp
similarity index 100%
rename from db/jsobj.cpp
rename to src/mongo/db/jsobj.cpp
diff --git a/db/jsobj.h b/src/mongo/db/jsobj.h
similarity index 100%
rename from db/jsobj.h
rename to src/mongo/db/jsobj.h
diff --git a/db/jsobjmanipulator.h b/src/mongo/db/jsobjmanipulator.h
similarity index 100%
rename from db/jsobjmanipulator.h
rename to src/mongo/db/jsobjmanipulator.h
diff --git a/db/json.cpp b/src/mongo/db/json.cpp
similarity index 100%
rename from db/json.cpp
rename to src/mongo/db/json.cpp
diff --git a/db/json.h b/src/mongo/db/json.h
similarity index 100%
rename from db/json.h
rename to src/mongo/db/json.h
diff --git a/db/key.cpp b/src/mongo/db/key.cpp
similarity index 100%
rename from db/key.cpp
rename to src/mongo/db/key.cpp
diff --git a/db/key.h b/src/mongo/db/key.h
similarity index 100%
rename from db/key.h
rename to src/mongo/db/key.h
diff --git a/db/lasterror.cpp b/src/mongo/db/lasterror.cpp
similarity index 100%
rename from db/lasterror.cpp
rename to src/mongo/db/lasterror.cpp
diff --git a/db/lasterror.h b/src/mongo/db/lasterror.h
similarity index 100%
rename from db/lasterror.h
rename to src/mongo/db/lasterror.h
diff --git a/db/matcher.cpp b/src/mongo/db/matcher.cpp
similarity index 100%
rename from db/matcher.cpp
rename to src/mongo/db/matcher.cpp
diff --git a/db/matcher.h b/src/mongo/db/matcher.h
similarity index 100%
rename from db/matcher.h
rename to src/mongo/db/matcher.h
diff --git a/db/matcher_covered.cpp b/src/mongo/db/matcher_covered.cpp
similarity index 100%
rename from db/matcher_covered.cpp
rename to src/mongo/db/matcher_covered.cpp
diff --git a/db/minilex.h b/src/mongo/db/minilex.h
similarity index 100%
rename from db/minilex.h
rename to src/mongo/db/minilex.h
diff --git a/db/module.cpp b/src/mongo/db/module.cpp
similarity index 100%
rename from db/module.cpp
rename to src/mongo/db/module.cpp
diff --git a/db/module.h b/src/mongo/db/module.h
similarity index 100%
rename from db/module.h
rename to src/mongo/db/module.h
diff --git a/db/modules/mms.cpp b/src/mongo/db/modules/mms.cpp
similarity index 100%
rename from db/modules/mms.cpp
rename to src/mongo/db/modules/mms.cpp
diff --git a/db/mongo.ico b/src/mongo/db/mongo.ico
similarity index 100%
rename from db/mongo.ico
rename to src/mongo/db/mongo.ico
diff --git a/db/mongommf.cpp b/src/mongo/db/mongommf.cpp
similarity index 100%
rename from db/mongommf.cpp
rename to src/mongo/db/mongommf.cpp
diff --git a/db/mongommf.h b/src/mongo/db/mongommf.h
similarity index 100%
rename from db/mongommf.h
rename to src/mongo/db/mongommf.h
diff --git a/db/mongomutex.h b/src/mongo/db/mongomutex.h
similarity index 100%
rename from db/mongomutex.h
rename to src/mongo/db/mongomutex.h
diff --git a/db/namespace-inl.h b/src/mongo/db/namespace-inl.h
similarity index 100%
rename from db/namespace-inl.h
rename to src/mongo/db/namespace-inl.h
diff --git a/db/namespace.cpp b/src/mongo/db/namespace.cpp
similarity index 100%
rename from db/namespace.cpp
rename to src/mongo/db/namespace.cpp
diff --git a/db/namespace.h b/src/mongo/db/namespace.h
similarity index 100%
rename from db/namespace.h
rename to src/mongo/db/namespace.h
diff --git a/db/namespacestring.h b/src/mongo/db/namespacestring.h
similarity index 100%
rename from db/namespacestring.h
rename to src/mongo/db/namespacestring.h
diff --git a/db/nonce.cpp b/src/mongo/db/nonce.cpp
similarity index 100%
rename from db/nonce.cpp
rename to src/mongo/db/nonce.cpp
diff --git a/db/nonce.h b/src/mongo/db/nonce.h
similarity index 100%
rename from db/nonce.h
rename to src/mongo/db/nonce.h
diff --git a/db/oplog.cpp b/src/mongo/db/oplog.cpp
similarity index 100%
rename from db/oplog.cpp
rename to src/mongo/db/oplog.cpp
diff --git a/db/oplog.h b/src/mongo/db/oplog.h
similarity index 100%
rename from db/oplog.h
rename to src/mongo/db/oplog.h
diff --git a/db/oplogreader.h b/src/mongo/db/oplogreader.h
similarity index 100%
rename from db/oplogreader.h
rename to src/mongo/db/oplogreader.h
diff --git a/db/ops/count.cpp b/src/mongo/db/ops/count.cpp
similarity index 100%
rename from db/ops/count.cpp
rename to src/mongo/db/ops/count.cpp
diff --git a/db/ops/count.h b/src/mongo/db/ops/count.h
similarity index 100%
rename from db/ops/count.h
rename to src/mongo/db/ops/count.h
diff --git a/db/ops/delete.cpp b/src/mongo/db/ops/delete.cpp
similarity index 100%
rename from db/ops/delete.cpp
rename to src/mongo/db/ops/delete.cpp
diff --git a/db/ops/delete.h b/src/mongo/db/ops/delete.h
similarity index 100%
rename from db/ops/delete.h
rename to src/mongo/db/ops/delete.h
diff --git a/db/ops/query.cpp b/src/mongo/db/ops/query.cpp
similarity index 100%
rename from db/ops/query.cpp
rename to src/mongo/db/ops/query.cpp
diff --git a/db/ops/query.h b/src/mongo/db/ops/query.h
similarity index 100%
rename from db/ops/query.h
rename to src/mongo/db/ops/query.h
diff --git a/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
similarity index 100%
rename from db/ops/update.cpp
rename to src/mongo/db/ops/update.cpp
diff --git a/db/ops/update.h b/src/mongo/db/ops/update.h
similarity index 100%
rename from db/ops/update.h
rename to src/mongo/db/ops/update.h
diff --git a/db/pagefault.cpp b/src/mongo/db/pagefault.cpp
similarity index 100%
rename from db/pagefault.cpp
rename to src/mongo/db/pagefault.cpp
diff --git a/db/pagefault.h b/src/mongo/db/pagefault.h
similarity index 100%
rename from db/pagefault.h
rename to src/mongo/db/pagefault.h
diff --git a/db/pcre.txt b/src/mongo/db/pcre.txt
similarity index 100%
rename from db/pcre.txt
rename to src/mongo/db/pcre.txt
diff --git a/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
similarity index 100%
rename from db/pdfile.cpp
rename to src/mongo/db/pdfile.cpp
diff --git a/db/pdfile.h b/src/mongo/db/pdfile.h
similarity index 100%
rename from db/pdfile.h
rename to src/mongo/db/pdfile.h
diff --git a/db/pipeline/accumulator.cpp b/src/mongo/db/pipeline/accumulator.cpp
similarity index 100%
rename from db/pipeline/accumulator.cpp
rename to src/mongo/db/pipeline/accumulator.cpp
diff --git a/db/pipeline/accumulator.h b/src/mongo/db/pipeline/accumulator.h
similarity index 100%
rename from db/pipeline/accumulator.h
rename to src/mongo/db/pipeline/accumulator.h
diff --git a/db/pipeline/accumulator_add_to_set.cpp b/src/mongo/db/pipeline/accumulator_add_to_set.cpp
similarity index 100%
rename from db/pipeline/accumulator_add_to_set.cpp
rename to src/mongo/db/pipeline/accumulator_add_to_set.cpp
diff --git a/db/pipeline/accumulator_avg.cpp b/src/mongo/db/pipeline/accumulator_avg.cpp
similarity index 100%
rename from db/pipeline/accumulator_avg.cpp
rename to src/mongo/db/pipeline/accumulator_avg.cpp
diff --git a/db/pipeline/accumulator_first.cpp b/src/mongo/db/pipeline/accumulator_first.cpp
similarity index 100%
rename from db/pipeline/accumulator_first.cpp
rename to src/mongo/db/pipeline/accumulator_first.cpp
diff --git a/db/pipeline/accumulator_last.cpp b/src/mongo/db/pipeline/accumulator_last.cpp
similarity index 100%
rename from db/pipeline/accumulator_last.cpp
rename to src/mongo/db/pipeline/accumulator_last.cpp
diff --git a/db/pipeline/accumulator_min_max.cpp b/src/mongo/db/pipeline/accumulator_min_max.cpp
similarity index 100%
rename from db/pipeline/accumulator_min_max.cpp
rename to src/mongo/db/pipeline/accumulator_min_max.cpp
diff --git a/db/pipeline/accumulator_push.cpp b/src/mongo/db/pipeline/accumulator_push.cpp
similarity index 100%
rename from db/pipeline/accumulator_push.cpp
rename to src/mongo/db/pipeline/accumulator_push.cpp
diff --git a/db/pipeline/accumulator_single_value.cpp b/src/mongo/db/pipeline/accumulator_single_value.cpp
similarity index 100%
rename from db/pipeline/accumulator_single_value.cpp
rename to src/mongo/db/pipeline/accumulator_single_value.cpp
diff --git a/db/pipeline/accumulator_sum.cpp b/src/mongo/db/pipeline/accumulator_sum.cpp
similarity index 100%
rename from db/pipeline/accumulator_sum.cpp
rename to src/mongo/db/pipeline/accumulator_sum.cpp
diff --git a/db/pipeline/builder.cpp b/src/mongo/db/pipeline/builder.cpp
similarity index 100%
rename from db/pipeline/builder.cpp
rename to src/mongo/db/pipeline/builder.cpp
diff --git a/db/pipeline/builder.h b/src/mongo/db/pipeline/builder.h
similarity index 100%
rename from db/pipeline/builder.h
rename to src/mongo/db/pipeline/builder.h
diff --git a/db/pipeline/doc_mem_monitor.cpp b/src/mongo/db/pipeline/doc_mem_monitor.cpp
similarity index 100%
rename from db/pipeline/doc_mem_monitor.cpp
rename to src/mongo/db/pipeline/doc_mem_monitor.cpp
diff --git a/db/pipeline/doc_mem_monitor.h b/src/mongo/db/pipeline/doc_mem_monitor.h
similarity index 100%
rename from db/pipeline/doc_mem_monitor.h
rename to src/mongo/db/pipeline/doc_mem_monitor.h
diff --git a/db/pipeline/document.cpp b/src/mongo/db/pipeline/document.cpp
similarity index 100%
rename from db/pipeline/document.cpp
rename to src/mongo/db/pipeline/document.cpp
diff --git a/db/pipeline/document.h b/src/mongo/db/pipeline/document.h
similarity index 100%
rename from db/pipeline/document.h
rename to src/mongo/db/pipeline/document.h
diff --git a/db/pipeline/document_source.cpp b/src/mongo/db/pipeline/document_source.cpp
similarity index 100%
rename from db/pipeline/document_source.cpp
rename to src/mongo/db/pipeline/document_source.cpp
diff --git a/db/pipeline/document_source.h b/src/mongo/db/pipeline/document_source.h
similarity index 100%
rename from db/pipeline/document_source.h
rename to src/mongo/db/pipeline/document_source.h
diff --git a/db/pipeline/document_source_bson_array.cpp b/src/mongo/db/pipeline/document_source_bson_array.cpp
similarity index 100%
rename from db/pipeline/document_source_bson_array.cpp
rename to src/mongo/db/pipeline/document_source_bson_array.cpp
diff --git a/db/pipeline/document_source_command_futures.cpp b/src/mongo/db/pipeline/document_source_command_futures.cpp
similarity index 100%
rename from db/pipeline/document_source_command_futures.cpp
rename to src/mongo/db/pipeline/document_source_command_futures.cpp
diff --git a/db/pipeline/document_source_filter.cpp b/src/mongo/db/pipeline/document_source_filter.cpp
similarity index 100%
rename from db/pipeline/document_source_filter.cpp
rename to src/mongo/db/pipeline/document_source_filter.cpp
diff --git a/db/pipeline/document_source_filter_base.cpp b/src/mongo/db/pipeline/document_source_filter_base.cpp
similarity index 100%
rename from db/pipeline/document_source_filter_base.cpp
rename to src/mongo/db/pipeline/document_source_filter_base.cpp
diff --git a/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp
similarity index 100%
rename from db/pipeline/document_source_group.cpp
rename to src/mongo/db/pipeline/document_source_group.cpp
diff --git a/db/pipeline/document_source_limit.cpp b/src/mongo/db/pipeline/document_source_limit.cpp
similarity index 100%
rename from db/pipeline/document_source_limit.cpp
rename to src/mongo/db/pipeline/document_source_limit.cpp
diff --git a/db/pipeline/document_source_match.cpp b/src/mongo/db/pipeline/document_source_match.cpp
similarity index 100%
rename from db/pipeline/document_source_match.cpp
rename to src/mongo/db/pipeline/document_source_match.cpp
diff --git a/db/pipeline/document_source_out.cpp b/src/mongo/db/pipeline/document_source_out.cpp
similarity index 100%
rename from db/pipeline/document_source_out.cpp
rename to src/mongo/db/pipeline/document_source_out.cpp
diff --git a/db/pipeline/document_source_project.cpp b/src/mongo/db/pipeline/document_source_project.cpp
similarity index 100%
rename from db/pipeline/document_source_project.cpp
rename to src/mongo/db/pipeline/document_source_project.cpp
diff --git a/db/pipeline/document_source_skip.cpp b/src/mongo/db/pipeline/document_source_skip.cpp
similarity index 100%
rename from db/pipeline/document_source_skip.cpp
rename to src/mongo/db/pipeline/document_source_skip.cpp
diff --git a/db/pipeline/document_source_sort.cpp b/src/mongo/db/pipeline/document_source_sort.cpp
similarity index 100%
rename from db/pipeline/document_source_sort.cpp
rename to src/mongo/db/pipeline/document_source_sort.cpp
diff --git a/db/pipeline/document_source_unwind.cpp b/src/mongo/db/pipeline/document_source_unwind.cpp
similarity index 100%
rename from db/pipeline/document_source_unwind.cpp
rename to src/mongo/db/pipeline/document_source_unwind.cpp
diff --git a/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp
similarity index 100%
rename from db/pipeline/expression.cpp
rename to src/mongo/db/pipeline/expression.cpp
diff --git a/db/pipeline/expression.h b/src/mongo/db/pipeline/expression.h
similarity index 100%
rename from db/pipeline/expression.h
rename to src/mongo/db/pipeline/expression.h
diff --git a/db/pipeline/expression_context.cpp b/src/mongo/db/pipeline/expression_context.cpp
similarity index 100%
rename from db/pipeline/expression_context.cpp
rename to src/mongo/db/pipeline/expression_context.cpp
diff --git a/db/pipeline/expression_context.h b/src/mongo/db/pipeline/expression_context.h
similarity index 100%
rename from db/pipeline/expression_context.h
rename to src/mongo/db/pipeline/expression_context.h
diff --git a/db/pipeline/field_path.cpp b/src/mongo/db/pipeline/field_path.cpp
similarity index 100%
rename from db/pipeline/field_path.cpp
rename to src/mongo/db/pipeline/field_path.cpp
diff --git a/db/pipeline/field_path.h b/src/mongo/db/pipeline/field_path.h
similarity index 100%
rename from db/pipeline/field_path.h
rename to src/mongo/db/pipeline/field_path.h
diff --git a/db/pipeline/value.cpp b/src/mongo/db/pipeline/value.cpp
similarity index 100%
rename from db/pipeline/value.cpp
rename to src/mongo/db/pipeline/value.cpp
diff --git a/db/pipeline/value.h b/src/mongo/db/pipeline/value.h
similarity index 100%
rename from db/pipeline/value.h
rename to src/mongo/db/pipeline/value.h
diff --git a/db/projection.cpp b/src/mongo/db/projection.cpp
similarity index 100%
rename from db/projection.cpp
rename to src/mongo/db/projection.cpp
diff --git a/db/projection.h b/src/mongo/db/projection.h
similarity index 100%
rename from db/projection.h
rename to src/mongo/db/projection.h
diff --git a/db/queryoptimizer.cpp b/src/mongo/db/queryoptimizer.cpp
similarity index 100%
rename from db/queryoptimizer.cpp
rename to src/mongo/db/queryoptimizer.cpp
diff --git a/db/queryoptimizer.h b/src/mongo/db/queryoptimizer.h
similarity index 100%
rename from db/queryoptimizer.h
rename to src/mongo/db/queryoptimizer.h
diff --git a/db/queryoptimizercursor.cpp b/src/mongo/db/queryoptimizercursor.cpp
similarity index 100%
rename from db/queryoptimizercursor.cpp
rename to src/mongo/db/queryoptimizercursor.cpp
diff --git a/db/queryoptimizercursor.h b/src/mongo/db/queryoptimizercursor.h
similarity index 100%
rename from db/queryoptimizercursor.h
rename to src/mongo/db/queryoptimizercursor.h
diff --git a/db/querypattern.cpp b/src/mongo/db/querypattern.cpp
similarity index 100%
rename from db/querypattern.cpp
rename to src/mongo/db/querypattern.cpp
diff --git a/db/querypattern.h b/src/mongo/db/querypattern.h
similarity index 100%
rename from db/querypattern.h
rename to src/mongo/db/querypattern.h
diff --git a/db/queryutil-inl.h b/src/mongo/db/queryutil-inl.h
similarity index 100%
rename from db/queryutil-inl.h
rename to src/mongo/db/queryutil-inl.h
diff --git a/db/queryutil.cpp b/src/mongo/db/queryutil.cpp
similarity index 100%
rename from db/queryutil.cpp
rename to src/mongo/db/queryutil.cpp
diff --git a/db/queryutil.h b/src/mongo/db/queryutil.h
similarity index 100%
rename from db/queryutil.h
rename to src/mongo/db/queryutil.h
diff --git a/db/record.cpp b/src/mongo/db/record.cpp
similarity index 100%
rename from db/record.cpp
rename to src/mongo/db/record.cpp
diff --git a/db/repl.cpp b/src/mongo/db/repl.cpp
similarity index 100%
rename from db/repl.cpp
rename to src/mongo/db/repl.cpp
diff --git a/db/repl.h b/src/mongo/db/repl.h
similarity index 100%
rename from db/repl.h
rename to src/mongo/db/repl.h
diff --git a/db/repl/connections.h b/src/mongo/db/repl/connections.h
similarity index 100%
rename from db/repl/connections.h
rename to src/mongo/db/repl/connections.h
diff --git a/db/repl/consensus.cpp b/src/mongo/db/repl/consensus.cpp
similarity index 100%
rename from db/repl/consensus.cpp
rename to src/mongo/db/repl/consensus.cpp
diff --git a/db/repl/health.cpp b/src/mongo/db/repl/health.cpp
similarity index 100%
rename from db/repl/health.cpp
rename to src/mongo/db/repl/health.cpp
diff --git a/db/repl/health.h b/src/mongo/db/repl/health.h
similarity index 100%
rename from db/repl/health.h
rename to src/mongo/db/repl/health.h
diff --git a/db/repl/heartbeat.cpp b/src/mongo/db/repl/heartbeat.cpp
similarity index 100%
rename from db/repl/heartbeat.cpp
rename to src/mongo/db/repl/heartbeat.cpp
diff --git a/db/repl/manager.cpp b/src/mongo/db/repl/manager.cpp
similarity index 100%
rename from db/repl/manager.cpp
rename to src/mongo/db/repl/manager.cpp
diff --git a/db/repl/multicmd.h b/src/mongo/db/repl/multicmd.h
similarity index 100%
rename from db/repl/multicmd.h
rename to src/mongo/db/repl/multicmd.h
diff --git a/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
similarity index 100%
rename from db/repl/replset_commands.cpp
rename to src/mongo/db/repl/replset_commands.cpp
diff --git a/db/repl/rs.cpp b/src/mongo/db/repl/rs.cpp
similarity index 100%
rename from db/repl/rs.cpp
rename to src/mongo/db/repl/rs.cpp
diff --git a/db/repl/rs.h b/src/mongo/db/repl/rs.h
similarity index 100%
rename from db/repl/rs.h
rename to src/mongo/db/repl/rs.h
diff --git a/db/repl/rs_config.cpp b/src/mongo/db/repl/rs_config.cpp
similarity index 100%
rename from db/repl/rs_config.cpp
rename to src/mongo/db/repl/rs_config.cpp
diff --git a/db/repl/rs_config.h b/src/mongo/db/repl/rs_config.h
similarity index 100%
rename from db/repl/rs_config.h
rename to src/mongo/db/repl/rs_config.h
diff --git a/db/repl/rs_exception.h b/src/mongo/db/repl/rs_exception.h
similarity index 100%
rename from db/repl/rs_exception.h
rename to src/mongo/db/repl/rs_exception.h
diff --git a/db/repl/rs_initialsync.cpp b/src/mongo/db/repl/rs_initialsync.cpp
similarity index 100%
rename from db/repl/rs_initialsync.cpp
rename to src/mongo/db/repl/rs_initialsync.cpp
diff --git a/db/repl/rs_initiate.cpp b/src/mongo/db/repl/rs_initiate.cpp
similarity index 100%
rename from db/repl/rs_initiate.cpp
rename to src/mongo/db/repl/rs_initiate.cpp
diff --git a/db/repl/rs_member.h b/src/mongo/db/repl/rs_member.h
similarity index 100%
rename from db/repl/rs_member.h
rename to src/mongo/db/repl/rs_member.h
diff --git a/db/repl/rs_optime.h b/src/mongo/db/repl/rs_optime.h
similarity index 100%
rename from db/repl/rs_optime.h
rename to src/mongo/db/repl/rs_optime.h
diff --git a/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
similarity index 100%
rename from db/repl/rs_rollback.cpp
rename to src/mongo/db/repl/rs_rollback.cpp
diff --git a/db/repl/rs_sync.cpp b/src/mongo/db/repl/rs_sync.cpp
similarity index 100%
rename from db/repl/rs_sync.cpp
rename to src/mongo/db/repl/rs_sync.cpp
diff --git a/db/repl/test.html b/src/mongo/db/repl/test.html
similarity index 100%
rename from db/repl/test.html
rename to src/mongo/db/repl/test.html
diff --git a/db/repl/testing.js b/src/mongo/db/repl/testing.js
similarity index 100%
rename from db/repl/testing.js
rename to src/mongo/db/repl/testing.js
diff --git a/db/repl_block.cpp b/src/mongo/db/repl_block.cpp
similarity index 100%
rename from db/repl_block.cpp
rename to src/mongo/db/repl_block.cpp
diff --git a/db/repl_block.h b/src/mongo/db/repl_block.h
similarity index 100%
rename from db/repl_block.h
rename to src/mongo/db/repl_block.h
diff --git a/db/replutil.h b/src/mongo/db/replutil.h
similarity index 100%
rename from db/replutil.h
rename to src/mongo/db/replutil.h
diff --git a/db/resource.h b/src/mongo/db/resource.h
similarity index 100%
rename from db/resource.h
rename to src/mongo/db/resource.h
diff --git a/db/restapi.cpp b/src/mongo/db/restapi.cpp
similarity index 100%
rename from db/restapi.cpp
rename to src/mongo/db/restapi.cpp
diff --git a/db/restapi.h b/src/mongo/db/restapi.h
similarity index 100%
rename from db/restapi.h
rename to src/mongo/db/restapi.h
diff --git a/db/scanandorder.cpp b/src/mongo/db/scanandorder.cpp
similarity index 100%
rename from db/scanandorder.cpp
rename to src/mongo/db/scanandorder.cpp
diff --git a/db/scanandorder.h b/src/mongo/db/scanandorder.h
similarity index 100%
rename from db/scanandorder.h
rename to src/mongo/db/scanandorder.h
diff --git a/db/security.cpp b/src/mongo/db/security.cpp
similarity index 100%
rename from db/security.cpp
rename to src/mongo/db/security.cpp
diff --git a/db/security.h b/src/mongo/db/security.h
similarity index 100%
rename from db/security.h
rename to src/mongo/db/security.h
diff --git a/db/security_commands.cpp b/src/mongo/db/security_commands.cpp
similarity index 100%
rename from db/security_commands.cpp
rename to src/mongo/db/security_commands.cpp
diff --git a/db/security_common.cpp b/src/mongo/db/security_common.cpp
similarity index 100%
rename from db/security_common.cpp
rename to src/mongo/db/security_common.cpp
diff --git a/db/security_common.h b/src/mongo/db/security_common.h
similarity index 100%
rename from db/security_common.h
rename to src/mongo/db/security_common.h
diff --git a/db/stats/counters.cpp b/src/mongo/db/stats/counters.cpp
similarity index 100%
rename from db/stats/counters.cpp
rename to src/mongo/db/stats/counters.cpp
diff --git a/db/stats/counters.h b/src/mongo/db/stats/counters.h
similarity index 100%
rename from db/stats/counters.h
rename to src/mongo/db/stats/counters.h
diff --git a/db/stats/fine_clock.h b/src/mongo/db/stats/fine_clock.h
similarity index 100%
rename from db/stats/fine_clock.h
rename to src/mongo/db/stats/fine_clock.h
diff --git a/db/stats/service_stats.cpp b/src/mongo/db/stats/service_stats.cpp
similarity index 100%
rename from db/stats/service_stats.cpp
rename to src/mongo/db/stats/service_stats.cpp
diff --git a/db/stats/service_stats.h b/src/mongo/db/stats/service_stats.h
similarity index 100%
rename from db/stats/service_stats.h
rename to src/mongo/db/stats/service_stats.h
diff --git a/db/stats/snapshots.cpp b/src/mongo/db/stats/snapshots.cpp
similarity index 100%
rename from db/stats/snapshots.cpp
rename to src/mongo/db/stats/snapshots.cpp
diff --git a/db/stats/snapshots.h b/src/mongo/db/stats/snapshots.h
similarity index 100%
rename from db/stats/snapshots.h
rename to src/mongo/db/stats/snapshots.h
diff --git a/db/stats/top.cpp b/src/mongo/db/stats/top.cpp
similarity index 100%
rename from db/stats/top.cpp
rename to src/mongo/db/stats/top.cpp
diff --git a/db/stats/top.h b/src/mongo/db/stats/top.h
similarity index 100%
rename from db/stats/top.h
rename to src/mongo/db/stats/top.h
diff --git a/db/taskqueue.h b/src/mongo/db/taskqueue.h
similarity index 100%
rename from db/taskqueue.h
rename to src/mongo/db/taskqueue.h
diff --git a/db/tests.cpp b/src/mongo/db/tests.cpp
similarity index 100%
rename from db/tests.cpp
rename to src/mongo/db/tests.cpp
diff --git a/dbtests/background_job_test.cpp b/src/mongo/dbtests/background_job_test.cpp
similarity index 100%
rename from dbtests/background_job_test.cpp
rename to src/mongo/dbtests/background_job_test.cpp
diff --git a/dbtests/balancer_policy_tests.cpp b/src/mongo/dbtests/balancer_policy_tests.cpp
similarity index 100%
rename from dbtests/balancer_policy_tests.cpp
rename to src/mongo/dbtests/balancer_policy_tests.cpp
diff --git a/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp
similarity index 100%
rename from dbtests/basictests.cpp
rename to src/mongo/dbtests/basictests.cpp
diff --git a/dbtests/btreetests.cpp b/src/mongo/dbtests/btreetests.cpp
similarity index 100%
rename from dbtests/btreetests.cpp
rename to src/mongo/dbtests/btreetests.cpp
diff --git a/dbtests/btreetests.inl b/src/mongo/dbtests/btreetests.inl
similarity index 100%
rename from dbtests/btreetests.inl
rename to src/mongo/dbtests/btreetests.inl
diff --git a/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp
similarity index 100%
rename from dbtests/clienttests.cpp
rename to src/mongo/dbtests/clienttests.cpp
diff --git a/dbtests/commandtests.cpp b/src/mongo/dbtests/commandtests.cpp
similarity index 100%
rename from dbtests/commandtests.cpp
rename to src/mongo/dbtests/commandtests.cpp
diff --git a/dbtests/counttests.cpp b/src/mongo/dbtests/counttests.cpp
similarity index 100%
rename from dbtests/counttests.cpp
rename to src/mongo/dbtests/counttests.cpp
diff --git a/dbtests/cursortests.cpp b/src/mongo/dbtests/cursortests.cpp
similarity index 100%
rename from dbtests/cursortests.cpp
rename to src/mongo/dbtests/cursortests.cpp
diff --git a/dbtests/d_chunk_manager_tests.cpp b/src/mongo/dbtests/d_chunk_manager_tests.cpp
similarity index 100%
rename from dbtests/d_chunk_manager_tests.cpp
rename to src/mongo/dbtests/d_chunk_manager_tests.cpp
diff --git a/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp
similarity index 100%
rename from dbtests/dbtests.cpp
rename to src/mongo/dbtests/dbtests.cpp
diff --git a/dbtests/dbtests.h b/src/mongo/dbtests/dbtests.h
similarity index 100%
rename from dbtests/dbtests.h
rename to src/mongo/dbtests/dbtests.h
diff --git a/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp
similarity index 100%
rename from dbtests/directclienttests.cpp
rename to src/mongo/dbtests/directclienttests.cpp
diff --git a/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp
similarity index 100%
rename from dbtests/framework.cpp
rename to src/mongo/dbtests/framework.cpp
diff --git a/dbtests/framework.h b/src/mongo/dbtests/framework.h
similarity index 100%
rename from dbtests/framework.h
rename to src/mongo/dbtests/framework.h
diff --git a/dbtests/histogram_test.cpp b/src/mongo/dbtests/histogram_test.cpp
similarity index 100%
rename from dbtests/histogram_test.cpp
rename to src/mongo/dbtests/histogram_test.cpp
diff --git a/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
similarity index 100%
rename from dbtests/jsobjtests.cpp
rename to src/mongo/dbtests/jsobjtests.cpp
diff --git a/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp
similarity index 100%
rename from dbtests/jsontests.cpp
rename to src/mongo/dbtests/jsontests.cpp
diff --git a/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
similarity index 100%
rename from dbtests/jstests.cpp
rename to src/mongo/dbtests/jstests.cpp
diff --git a/dbtests/macrotests.cpp b/src/mongo/dbtests/macrotests.cpp
similarity index 100%
rename from dbtests/macrotests.cpp
rename to src/mongo/dbtests/macrotests.cpp
diff --git a/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp
similarity index 100%
rename from dbtests/matchertests.cpp
rename to src/mongo/dbtests/matchertests.cpp
diff --git a/dbtests/mmaptests.cpp b/src/mongo/dbtests/mmaptests.cpp
similarity index 100%
rename from dbtests/mmaptests.cpp
rename to src/mongo/dbtests/mmaptests.cpp
diff --git a/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp
similarity index 100%
rename from dbtests/namespacetests.cpp
rename to src/mongo/dbtests/namespacetests.cpp
diff --git a/dbtests/pdfiletests.cpp b/src/mongo/dbtests/pdfiletests.cpp
similarity index 100%
rename from dbtests/pdfiletests.cpp
rename to src/mongo/dbtests/pdfiletests.cpp
diff --git a/dbtests/perf/btreeperf.cpp b/src/mongo/dbtests/perf/btreeperf.cpp
similarity index 100%
rename from dbtests/perf/btreeperf.cpp
rename to src/mongo/dbtests/perf/btreeperf.cpp
diff --git a/dbtests/perf/perftest.cpp b/src/mongo/dbtests/perf/perftest.cpp
similarity index 100%
rename from dbtests/perf/perftest.cpp
rename to src/mongo/dbtests/perf/perftest.cpp
diff --git a/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
similarity index 100%
rename from dbtests/perftests.cpp
rename to src/mongo/dbtests/perftests.cpp
diff --git a/dbtests/queryoptimizercursortests.cpp b/src/mongo/dbtests/queryoptimizercursortests.cpp
similarity index 100%
rename from dbtests/queryoptimizercursortests.cpp
rename to src/mongo/dbtests/queryoptimizercursortests.cpp
diff --git a/dbtests/queryoptimizertests.cpp b/src/mongo/dbtests/queryoptimizertests.cpp
similarity index 100%
rename from dbtests/queryoptimizertests.cpp
rename to src/mongo/dbtests/queryoptimizertests.cpp
diff --git a/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
similarity index 100%
rename from dbtests/querytests.cpp
rename to src/mongo/dbtests/querytests.cpp
diff --git a/dbtests/queryutiltests.cpp b/src/mongo/dbtests/queryutiltests.cpp
similarity index 100%
rename from dbtests/queryutiltests.cpp
rename to src/mongo/dbtests/queryutiltests.cpp
diff --git a/dbtests/replsettests.cpp b/src/mongo/dbtests/replsettests.cpp
similarity index 100%
rename from dbtests/replsettests.cpp
rename to src/mongo/dbtests/replsettests.cpp
diff --git a/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp
similarity index 100%
rename from dbtests/repltests.cpp
rename to src/mongo/dbtests/repltests.cpp
diff --git a/dbtests/sharding.cpp b/src/mongo/dbtests/sharding.cpp
similarity index 100%
rename from dbtests/sharding.cpp
rename to src/mongo/dbtests/sharding.cpp
diff --git a/dbtests/socktests.cpp b/src/mongo/dbtests/socktests.cpp
similarity index 100%
rename from dbtests/socktests.cpp
rename to src/mongo/dbtests/socktests.cpp
diff --git a/dbtests/spin_lock_test.cpp b/src/mongo/dbtests/spin_lock_test.cpp
similarity index 100%
rename from dbtests/spin_lock_test.cpp
rename to src/mongo/dbtests/spin_lock_test.cpp
diff --git a/dbtests/test.sln b/src/mongo/dbtests/test.sln
similarity index 100%
rename from dbtests/test.sln
rename to src/mongo/dbtests/test.sln
diff --git a/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
similarity index 100%
rename from dbtests/test.vcxproj
rename to src/mongo/dbtests/test.vcxproj
diff --git a/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
similarity index 100%
rename from dbtests/test.vcxproj.filters
rename to src/mongo/dbtests/test.vcxproj.filters
diff --git a/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
similarity index 100%
rename from dbtests/threadedtests.cpp
rename to src/mongo/dbtests/threadedtests.cpp
diff --git a/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp
similarity index 100%
rename from dbtests/updatetests.cpp
rename to src/mongo/dbtests/updatetests.cpp
diff --git a/pch.cpp b/src/mongo/pch.cpp
similarity index 100%
rename from pch.cpp
rename to src/mongo/pch.cpp
diff --git a/pch.h b/src/mongo/pch.h
similarity index 100%
rename from pch.h
rename to src/mongo/pch.h
diff --git a/s/balance.cpp b/src/mongo/s/balance.cpp
similarity index 100%
rename from s/balance.cpp
rename to src/mongo/s/balance.cpp
diff --git a/s/balance.h b/src/mongo/s/balance.h
similarity index 100%
rename from s/balance.h
rename to src/mongo/s/balance.h
diff --git a/s/balancer_policy.cpp b/src/mongo/s/balancer_policy.cpp
similarity index 100%
rename from s/balancer_policy.cpp
rename to src/mongo/s/balancer_policy.cpp
diff --git a/s/balancer_policy.h b/src/mongo/s/balancer_policy.h
similarity index 100%
rename from s/balancer_policy.h
rename to src/mongo/s/balancer_policy.h
diff --git a/s/chunk.cpp b/src/mongo/s/chunk.cpp
similarity index 100%
rename from s/chunk.cpp
rename to src/mongo/s/chunk.cpp
diff --git a/s/chunk.h b/src/mongo/s/chunk.h
similarity index 100%
rename from s/chunk.h
rename to src/mongo/s/chunk.h
diff --git a/s/client.cpp b/src/mongo/s/client.cpp
similarity index 100%
rename from s/client.cpp
rename to src/mongo/s/client.cpp
diff --git a/s/client.h b/src/mongo/s/client.h
similarity index 100%
rename from s/client.h
rename to src/mongo/s/client.h
diff --git a/s/commands_admin.cpp b/src/mongo/s/commands_admin.cpp
similarity index 100%
rename from s/commands_admin.cpp
rename to src/mongo/s/commands_admin.cpp
diff --git a/s/commands_public.cpp b/src/mongo/s/commands_public.cpp
similarity index 100%
rename from s/commands_public.cpp
rename to src/mongo/s/commands_public.cpp
diff --git a/s/config.cpp b/src/mongo/s/config.cpp
similarity index 100%
rename from s/config.cpp
rename to src/mongo/s/config.cpp
diff --git a/s/config.h b/src/mongo/s/config.h
similarity index 100%
rename from s/config.h
rename to src/mongo/s/config.h
diff --git a/s/config_migrate.cpp b/src/mongo/s/config_migrate.cpp
similarity index 100%
rename from s/config_migrate.cpp
rename to src/mongo/s/config_migrate.cpp
diff --git a/s/cursors.cpp b/src/mongo/s/cursors.cpp
similarity index 100%
rename from s/cursors.cpp
rename to src/mongo/s/cursors.cpp
diff --git a/s/cursors.h b/src/mongo/s/cursors.h
similarity index 100%
rename from s/cursors.h
rename to src/mongo/s/cursors.h
diff --git a/s/d_chunk_manager.cpp b/src/mongo/s/d_chunk_manager.cpp
similarity index 100%
rename from s/d_chunk_manager.cpp
rename to src/mongo/s/d_chunk_manager.cpp
diff --git a/s/d_chunk_manager.h b/src/mongo/s/d_chunk_manager.h
similarity index 100%
rename from s/d_chunk_manager.h
rename to src/mongo/s/d_chunk_manager.h
diff --git a/s/d_logic.cpp b/src/mongo/s/d_logic.cpp
similarity index 100%
rename from s/d_logic.cpp
rename to src/mongo/s/d_logic.cpp
diff --git a/s/d_logic.h b/src/mongo/s/d_logic.h
similarity index 100%
rename from s/d_logic.h
rename to src/mongo/s/d_logic.h
diff --git a/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
similarity index 100%
rename from s/d_migrate.cpp
rename to src/mongo/s/d_migrate.cpp
diff --git a/s/d_split.cpp b/src/mongo/s/d_split.cpp
similarity index 100%
rename from s/d_split.cpp
rename to src/mongo/s/d_split.cpp
diff --git a/s/d_state.cpp b/src/mongo/s/d_state.cpp
similarity index 100%
rename from s/d_state.cpp
rename to src/mongo/s/d_state.cpp
diff --git a/s/d_writeback.cpp b/src/mongo/s/d_writeback.cpp
similarity index 100%
rename from s/d_writeback.cpp
rename to src/mongo/s/d_writeback.cpp
diff --git a/s/d_writeback.h b/src/mongo/s/d_writeback.h
similarity index 100%
rename from s/d_writeback.h
rename to src/mongo/s/d_writeback.h
diff --git a/s/dbgrid.vcxproj b/src/mongo/s/dbgrid.vcxproj
similarity index 100%
rename from s/dbgrid.vcxproj
rename to src/mongo/s/dbgrid.vcxproj
diff --git a/s/dbgrid.vcxproj.filters b/src/mongo/s/dbgrid.vcxproj.filters
similarity index 100%
rename from s/dbgrid.vcxproj.filters
rename to src/mongo/s/dbgrid.vcxproj.filters
diff --git a/s/default_version.cpp b/src/mongo/s/default_version.cpp
similarity index 100%
rename from s/default_version.cpp
rename to src/mongo/s/default_version.cpp
diff --git a/s/grid.cpp b/src/mongo/s/grid.cpp
similarity index 100%
rename from s/grid.cpp
rename to src/mongo/s/grid.cpp
diff --git a/s/grid.h b/src/mongo/s/grid.h
similarity index 100%
rename from s/grid.h
rename to src/mongo/s/grid.h
diff --git a/s/mr_shard.cpp b/src/mongo/s/mr_shard.cpp
similarity index 100%
rename from s/mr_shard.cpp
rename to src/mongo/s/mr_shard.cpp
diff --git a/s/mr_shard.h b/src/mongo/s/mr_shard.h
similarity index 100%
rename from s/mr_shard.h
rename to src/mongo/s/mr_shard.h
diff --git a/s/request.cpp b/src/mongo/s/request.cpp
similarity index 100%
rename from s/request.cpp
rename to src/mongo/s/request.cpp
diff --git a/s/request.h b/src/mongo/s/request.h
similarity index 100%
rename from s/request.h
rename to src/mongo/s/request.h
diff --git a/s/s_only.cpp b/src/mongo/s/s_only.cpp
similarity index 100%
rename from s/s_only.cpp
rename to src/mongo/s/s_only.cpp
diff --git a/s/security.cpp b/src/mongo/s/security.cpp
similarity index 100%
rename from s/security.cpp
rename to src/mongo/s/security.cpp
diff --git a/s/server.cpp b/src/mongo/s/server.cpp
similarity index 100%
rename from s/server.cpp
rename to src/mongo/s/server.cpp
diff --git a/s/server.h b/src/mongo/s/server.h
similarity index 100%
rename from s/server.h
rename to src/mongo/s/server.h
diff --git a/s/shard.cpp b/src/mongo/s/shard.cpp
similarity index 100%
rename from s/shard.cpp
rename to src/mongo/s/shard.cpp
diff --git a/s/shard.h b/src/mongo/s/shard.h
similarity index 100%
rename from s/shard.h
rename to src/mongo/s/shard.h
diff --git a/s/shard_version.cpp b/src/mongo/s/shard_version.cpp
similarity index 100%
rename from s/shard_version.cpp
rename to src/mongo/s/shard_version.cpp
diff --git a/s/shard_version.h b/src/mongo/s/shard_version.h
similarity index 100%
rename from s/shard_version.h
rename to src/mongo/s/shard_version.h
diff --git a/s/shardconnection.cpp b/src/mongo/s/shardconnection.cpp
similarity index 100%
rename from s/shardconnection.cpp
rename to src/mongo/s/shardconnection.cpp
diff --git a/s/shardkey.cpp b/src/mongo/s/shardkey.cpp
similarity index 100%
rename from s/shardkey.cpp
rename to src/mongo/s/shardkey.cpp
diff --git a/s/shardkey.h b/src/mongo/s/shardkey.h
similarity index 100%
rename from s/shardkey.h
rename to src/mongo/s/shardkey.h
diff --git a/s/stats.cpp b/src/mongo/s/stats.cpp
similarity index 100%
rename from s/stats.cpp
rename to src/mongo/s/stats.cpp
diff --git a/s/stats.h b/src/mongo/s/stats.h
similarity index 100%
rename from s/stats.h
rename to src/mongo/s/stats.h
diff --git a/s/strategy.cpp b/src/mongo/s/strategy.cpp
similarity index 100%
rename from s/strategy.cpp
rename to src/mongo/s/strategy.cpp
diff --git a/s/strategy.h b/src/mongo/s/strategy.h
similarity index 100%
rename from s/strategy.h
rename to src/mongo/s/strategy.h
diff --git a/s/strategy_shard.cpp b/src/mongo/s/strategy_shard.cpp
similarity index 100%
rename from s/strategy_shard.cpp
rename to src/mongo/s/strategy_shard.cpp
diff --git a/s/strategy_single.cpp b/src/mongo/s/strategy_single.cpp
similarity index 100%
rename from s/strategy_single.cpp
rename to src/mongo/s/strategy_single.cpp
diff --git a/s/util.h b/src/mongo/s/util.h
similarity index 100%
rename from s/util.h
rename to src/mongo/s/util.h
diff --git a/s/writeback_listener.cpp b/src/mongo/s/writeback_listener.cpp
similarity index 100%
rename from s/writeback_listener.cpp
rename to src/mongo/s/writeback_listener.cpp
diff --git a/s/writeback_listener.h b/src/mongo/s/writeback_listener.h
similarity index 100%
rename from s/writeback_listener.h
rename to src/mongo/s/writeback_listener.h
diff --git a/scripting/bench.cpp b/src/mongo/scripting/bench.cpp
similarity index 100%
rename from scripting/bench.cpp
rename to src/mongo/scripting/bench.cpp
diff --git a/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
similarity index 100%
rename from scripting/engine.cpp
rename to src/mongo/scripting/engine.cpp
diff --git a/scripting/engine.h b/src/mongo/scripting/engine.h
similarity index 100%
rename from scripting/engine.h
rename to src/mongo/scripting/engine.h
diff --git a/scripting/engine_java.cpp b/src/mongo/scripting/engine_java.cpp
similarity index 100%
rename from scripting/engine_java.cpp
rename to src/mongo/scripting/engine_java.cpp
diff --git a/scripting/engine_java.h b/src/mongo/scripting/engine_java.h
similarity index 100%
rename from scripting/engine_java.h
rename to src/mongo/scripting/engine_java.h
diff --git a/scripting/engine_none.cpp b/src/mongo/scripting/engine_none.cpp
similarity index 100%
rename from scripting/engine_none.cpp
rename to src/mongo/scripting/engine_none.cpp
diff --git a/scripting/engine_spidermonkey.cpp b/src/mongo/scripting/engine_spidermonkey.cpp
similarity index 100%
rename from scripting/engine_spidermonkey.cpp
rename to src/mongo/scripting/engine_spidermonkey.cpp
diff --git a/scripting/engine_spidermonkey.h b/src/mongo/scripting/engine_spidermonkey.h
similarity index 100%
rename from scripting/engine_spidermonkey.h
rename to src/mongo/scripting/engine_spidermonkey.h
diff --git a/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
similarity index 100%
rename from scripting/engine_v8.cpp
rename to src/mongo/scripting/engine_v8.cpp
diff --git a/scripting/engine_v8.h b/src/mongo/scripting/engine_v8.h
similarity index 100%
rename from scripting/engine_v8.h
rename to src/mongo/scripting/engine_v8.h
diff --git a/scripting/sm_db.cpp b/src/mongo/scripting/sm_db.cpp
similarity index 100%
rename from scripting/sm_db.cpp
rename to src/mongo/scripting/sm_db.cpp
diff --git a/scripting/utils.cpp b/src/mongo/scripting/utils.cpp
similarity index 100%
rename from scripting/utils.cpp
rename to src/mongo/scripting/utils.cpp
diff --git a/scripting/v8_db.cpp b/src/mongo/scripting/v8_db.cpp
similarity index 100%
rename from scripting/v8_db.cpp
rename to src/mongo/scripting/v8_db.cpp
diff --git a/scripting/v8_db.h b/src/mongo/scripting/v8_db.h
similarity index 100%
rename from scripting/v8_db.h
rename to src/mongo/scripting/v8_db.h
diff --git a/scripting/v8_utils.cpp b/src/mongo/scripting/v8_utils.cpp
similarity index 100%
rename from scripting/v8_utils.cpp
rename to src/mongo/scripting/v8_utils.cpp
diff --git a/scripting/v8_utils.h b/src/mongo/scripting/v8_utils.h
similarity index 100%
rename from scripting/v8_utils.h
rename to src/mongo/scripting/v8_utils.h
diff --git a/scripting/v8_wrapper.cpp b/src/mongo/scripting/v8_wrapper.cpp
similarity index 100%
rename from scripting/v8_wrapper.cpp
rename to src/mongo/scripting/v8_wrapper.cpp
diff --git a/scripting/v8_wrapper.h b/src/mongo/scripting/v8_wrapper.h
similarity index 100%
rename from scripting/v8_wrapper.h
rename to src/mongo/scripting/v8_wrapper.h
diff --git a/server.h b/src/mongo/server.h
similarity index 100%
rename from server.h
rename to src/mongo/server.h
diff --git a/shell/collection.js b/src/mongo/shell/collection.js
similarity index 100%
rename from shell/collection.js
rename to src/mongo/shell/collection.js
diff --git a/shell/db.js b/src/mongo/shell/db.js
similarity index 100%
rename from shell/db.js
rename to src/mongo/shell/db.js
diff --git a/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
similarity index 100%
rename from shell/dbshell.cpp
rename to src/mongo/shell/dbshell.cpp
diff --git a/shell/mongo.js b/src/mongo/shell/mongo.js
similarity index 100%
rename from shell/mongo.js
rename to src/mongo/shell/mongo.js
diff --git a/shell/mr.js b/src/mongo/shell/mr.js
similarity index 100%
rename from shell/mr.js
rename to src/mongo/shell/mr.js
diff --git a/shell/msvc/createCPPfromJavaScriptFiles.js b/src/mongo/shell/msvc/createCPPfromJavaScriptFiles.js
similarity index 100%
rename from shell/msvc/createCPPfromJavaScriptFiles.js
rename to src/mongo/shell/msvc/createCPPfromJavaScriptFiles.js
diff --git a/shell/msvc/mongo.ico b/src/mongo/shell/msvc/mongo.ico
similarity index 100%
rename from shell/msvc/mongo.ico
rename to src/mongo/shell/msvc/mongo.ico
diff --git a/shell/msvc/mongo.sln b/src/mongo/shell/msvc/mongo.sln
similarity index 100%
rename from shell/msvc/mongo.sln
rename to src/mongo/shell/msvc/mongo.sln
diff --git a/shell/msvc/mongo.vcxproj b/src/mongo/shell/msvc/mongo.vcxproj
similarity index 100%
rename from shell/msvc/mongo.vcxproj
rename to src/mongo/shell/msvc/mongo.vcxproj
diff --git a/shell/msvc/mongo.vcxproj.filters b/src/mongo/shell/msvc/mongo.vcxproj.filters
similarity index 100%
rename from shell/msvc/mongo.vcxproj.filters
rename to src/mongo/shell/msvc/mongo.vcxproj.filters
diff --git a/shell/query.js b/src/mongo/shell/query.js
similarity index 100%
rename from shell/query.js
rename to src/mongo/shell/query.js
diff --git a/shell/servers.js b/src/mongo/shell/servers.js
similarity index 100%
rename from shell/servers.js
rename to src/mongo/shell/servers.js
diff --git a/shell/shell_utils.cpp b/src/mongo/shell/shell_utils.cpp
similarity index 100%
rename from shell/shell_utils.cpp
rename to src/mongo/shell/shell_utils.cpp
diff --git a/shell/utils.h b/src/mongo/shell/utils.h
similarity index 100%
rename from shell/utils.h
rename to src/mongo/shell/utils.h
diff --git a/shell/utils.js b/src/mongo/shell/utils.js
similarity index 100%
rename from shell/utils.js
rename to src/mongo/shell/utils.js
diff --git a/shell/utils_sh.js b/src/mongo/shell/utils_sh.js
similarity index 100%
rename from shell/utils_sh.js
rename to src/mongo/shell/utils_sh.js
diff --git a/targetver.h b/src/mongo/targetver.h
similarity index 100%
rename from targetver.h
rename to src/mongo/targetver.h
diff --git a/tools/bridge.cpp b/src/mongo/tools/bridge.cpp
similarity index 100%
rename from tools/bridge.cpp
rename to src/mongo/tools/bridge.cpp
diff --git a/tools/bsondump.cpp b/src/mongo/tools/bsondump.cpp
similarity index 100%
rename from tools/bsondump.cpp
rename to src/mongo/tools/bsondump.cpp
diff --git a/tools/dump.cpp b/src/mongo/tools/dump.cpp
similarity index 100%
rename from tools/dump.cpp
rename to src/mongo/tools/dump.cpp
diff --git a/tools/export.cpp b/src/mongo/tools/export.cpp
similarity index 100%
rename from tools/export.cpp
rename to src/mongo/tools/export.cpp
diff --git a/tools/files.cpp b/src/mongo/tools/files.cpp
similarity index 100%
rename from tools/files.cpp
rename to src/mongo/tools/files.cpp
diff --git a/tools/import.cpp b/src/mongo/tools/import.cpp
similarity index 100%
rename from tools/import.cpp
rename to src/mongo/tools/import.cpp
diff --git a/tools/oplog.cpp b/src/mongo/tools/oplog.cpp
similarity index 100%
rename from tools/oplog.cpp
rename to src/mongo/tools/oplog.cpp
diff --git a/tools/restore.cpp b/src/mongo/tools/restore.cpp
similarity index 100%
rename from tools/restore.cpp
rename to src/mongo/tools/restore.cpp
diff --git a/tools/sniffer.cpp b/src/mongo/tools/sniffer.cpp
similarity index 100%
rename from tools/sniffer.cpp
rename to src/mongo/tools/sniffer.cpp
diff --git a/tools/stat.cpp b/src/mongo/tools/stat.cpp
similarity index 100%
rename from tools/stat.cpp
rename to src/mongo/tools/stat.cpp
diff --git a/tools/stat_util.cpp b/src/mongo/tools/stat_util.cpp
similarity index 100%
rename from tools/stat_util.cpp
rename to src/mongo/tools/stat_util.cpp
diff --git a/tools/stat_util.h b/src/mongo/tools/stat_util.h
similarity index 100%
rename from tools/stat_util.h
rename to src/mongo/tools/stat_util.h
diff --git a/tools/tool.cpp b/src/mongo/tools/tool.cpp
similarity index 100%
rename from tools/tool.cpp
rename to src/mongo/tools/tool.cpp
diff --git a/tools/tool.h b/src/mongo/tools/tool.h
similarity index 100%
rename from tools/tool.h
rename to src/mongo/tools/tool.h
diff --git a/tools/top.cpp b/src/mongo/tools/top.cpp
similarity index 100%
rename from tools/top.cpp
rename to src/mongo/tools/top.cpp
diff --git a/util/admin_access.h b/src/mongo/util/admin_access.h
similarity index 100%
rename from util/admin_access.h
rename to src/mongo/util/admin_access.h
diff --git a/util/alignedbuilder.cpp b/src/mongo/util/alignedbuilder.cpp
similarity index 100%
rename from util/alignedbuilder.cpp
rename to src/mongo/util/alignedbuilder.cpp
diff --git a/util/alignedbuilder.h b/src/mongo/util/alignedbuilder.h
similarity index 100%
rename from util/alignedbuilder.h
rename to src/mongo/util/alignedbuilder.h
diff --git a/util/allocator.h b/src/mongo/util/allocator.h
similarity index 100%
rename from util/allocator.h
rename to src/mongo/util/allocator.h
diff --git a/util/array.h b/src/mongo/util/array.h
similarity index 100%
rename from util/array.h
rename to src/mongo/util/array.h
diff --git a/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
similarity index 100%
rename from util/assert_util.cpp
rename to src/mongo/util/assert_util.cpp
diff --git a/util/assert_util.h b/src/mongo/util/assert_util.h
similarity index 100%
rename from util/assert_util.h
rename to src/mongo/util/assert_util.h
diff --git a/util/background.cpp b/src/mongo/util/background.cpp
similarity index 100%
rename from util/background.cpp
rename to src/mongo/util/background.cpp
diff --git a/util/background.h b/src/mongo/util/background.h
similarity index 100%
rename from util/background.h
rename to src/mongo/util/background.h
diff --git a/util/base64.cpp b/src/mongo/util/base64.cpp
similarity index 100%
rename from util/base64.cpp
rename to src/mongo/util/base64.cpp
diff --git a/util/base64.h b/src/mongo/util/base64.h
similarity index 100%
rename from util/base64.h
rename to src/mongo/util/base64.h
diff --git a/util/bson_util.h b/src/mongo/util/bson_util.h
similarity index 100%
rename from util/bson_util.h
rename to src/mongo/util/bson_util.h
diff --git a/util/bufreader.h b/src/mongo/util/bufreader.h
similarity index 100%
rename from util/bufreader.h
rename to src/mongo/util/bufreader.h
diff --git a/util/checksum.h b/src/mongo/util/checksum.h
similarity index 100%
rename from util/checksum.h
rename to src/mongo/util/checksum.h
diff --git a/util/compress.cpp b/src/mongo/util/compress.cpp
similarity index 100%
rename from util/compress.cpp
rename to src/mongo/util/compress.cpp
diff --git a/util/compress.h b/src/mongo/util/compress.h
similarity index 100%
rename from util/compress.h
rename to src/mongo/util/compress.h
diff --git a/util/concurrency/README b/src/mongo/util/concurrency/README
similarity index 100%
rename from util/concurrency/README
rename to src/mongo/util/concurrency/README
diff --git a/util/concurrency/list.h b/src/mongo/util/concurrency/list.h
similarity index 100%
rename from util/concurrency/list.h
rename to src/mongo/util/concurrency/list.h
diff --git a/util/concurrency/msg.h b/src/mongo/util/concurrency/msg.h
similarity index 100%
rename from util/concurrency/msg.h
rename to src/mongo/util/concurrency/msg.h
diff --git a/util/concurrency/mutex.h b/src/mongo/util/concurrency/mutex.h
similarity index 100%
rename from util/concurrency/mutex.h
rename to src/mongo/util/concurrency/mutex.h
diff --git a/util/concurrency/mutexdebugger.h b/src/mongo/util/concurrency/mutexdebugger.h
similarity index 100%
rename from util/concurrency/mutexdebugger.h
rename to src/mongo/util/concurrency/mutexdebugger.h
diff --git a/util/concurrency/mvar.h b/src/mongo/util/concurrency/mvar.h
similarity index 100%
rename from util/concurrency/mvar.h
rename to src/mongo/util/concurrency/mvar.h
diff --git a/util/concurrency/race.h b/src/mongo/util/concurrency/race.h
similarity index 100%
rename from util/concurrency/race.h
rename to src/mongo/util/concurrency/race.h
diff --git a/util/concurrency/rwlock.h b/src/mongo/util/concurrency/rwlock.h
similarity index 100%
rename from util/concurrency/rwlock.h
rename to src/mongo/util/concurrency/rwlock.h
diff --git a/util/concurrency/rwlockimpl.h b/src/mongo/util/concurrency/rwlockimpl.h
similarity index 100%
rename from util/concurrency/rwlockimpl.h
rename to src/mongo/util/concurrency/rwlockimpl.h
diff --git a/util/concurrency/shared_mutex_win.hpp b/src/mongo/util/concurrency/shared_mutex_win.hpp
similarity index 100%
rename from util/concurrency/shared_mutex_win.hpp
rename to src/mongo/util/concurrency/shared_mutex_win.hpp
diff --git a/util/concurrency/spin_lock.cpp b/src/mongo/util/concurrency/spin_lock.cpp
similarity index 100%
rename from util/concurrency/spin_lock.cpp
rename to src/mongo/util/concurrency/spin_lock.cpp
diff --git a/util/concurrency/spin_lock.h b/src/mongo/util/concurrency/spin_lock.h
similarity index 100%
rename from util/concurrency/spin_lock.h
rename to src/mongo/util/concurrency/spin_lock.h
diff --git a/util/concurrency/synchronization.cpp b/src/mongo/util/concurrency/synchronization.cpp
similarity index 100%
rename from util/concurrency/synchronization.cpp
rename to src/mongo/util/concurrency/synchronization.cpp
diff --git a/util/concurrency/synchronization.h b/src/mongo/util/concurrency/synchronization.h
similarity index 100%
rename from util/concurrency/synchronization.h
rename to src/mongo/util/concurrency/synchronization.h
diff --git a/util/concurrency/task.cpp b/src/mongo/util/concurrency/task.cpp
similarity index 100%
rename from util/concurrency/task.cpp
rename to src/mongo/util/concurrency/task.cpp
diff --git a/util/concurrency/task.h b/src/mongo/util/concurrency/task.h
similarity index 100%
rename from util/concurrency/task.h
rename to src/mongo/util/concurrency/task.h
diff --git a/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp
similarity index 100%
rename from util/concurrency/thread_pool.cpp
rename to src/mongo/util/concurrency/thread_pool.cpp
diff --git a/util/concurrency/thread_pool.h b/src/mongo/util/concurrency/thread_pool.h
similarity index 100%
rename from util/concurrency/thread_pool.h
rename to src/mongo/util/concurrency/thread_pool.h
diff --git a/util/concurrency/threadlocal.h b/src/mongo/util/concurrency/threadlocal.h
similarity index 100%
rename from util/concurrency/threadlocal.h
rename to src/mongo/util/concurrency/threadlocal.h
diff --git a/util/concurrency/value.h b/src/mongo/util/concurrency/value.h
similarity index 100%
rename from util/concurrency/value.h
rename to src/mongo/util/concurrency/value.h
diff --git a/util/concurrency/vars.cpp b/src/mongo/util/concurrency/vars.cpp
similarity index 100%
rename from util/concurrency/vars.cpp
rename to src/mongo/util/concurrency/vars.cpp
diff --git a/util/debug_util.cpp b/src/mongo/util/debug_util.cpp
similarity index 100%
rename from util/debug_util.cpp
rename to src/mongo/util/debug_util.cpp
diff --git a/util/debug_util.h b/src/mongo/util/debug_util.h
similarity index 100%
rename from util/debug_util.h
rename to src/mongo/util/debug_util.h
diff --git a/util/embedded_builder.h b/src/mongo/util/embedded_builder.h
similarity index 100%
rename from util/embedded_builder.h
rename to src/mongo/util/embedded_builder.h
diff --git a/util/file.h b/src/mongo/util/file.h
similarity index 100%
rename from util/file.h
rename to src/mongo/util/file.h
diff --git a/util/file_allocator.cpp b/src/mongo/util/file_allocator.cpp
similarity index 100%
rename from util/file_allocator.cpp
rename to src/mongo/util/file_allocator.cpp
diff --git a/util/file_allocator.h b/src/mongo/util/file_allocator.h
similarity index 100%
rename from util/file_allocator.h
rename to src/mongo/util/file_allocator.h
diff --git a/util/goodies.h b/src/mongo/util/goodies.h
similarity index 100%
rename from util/goodies.h
rename to src/mongo/util/goodies.h
diff --git a/util/hashtab.h b/src/mongo/util/hashtab.h
similarity index 100%
rename from util/hashtab.h
rename to src/mongo/util/hashtab.h
diff --git a/util/heapcheck.h b/src/mongo/util/heapcheck.h
similarity index 100%
rename from util/heapcheck.h
rename to src/mongo/util/heapcheck.h
diff --git a/util/hex.h b/src/mongo/util/hex.h
similarity index 100%
rename from util/hex.h
rename to src/mongo/util/hex.h
diff --git a/util/histogram.cpp b/src/mongo/util/histogram.cpp
similarity index 100%
rename from util/histogram.cpp
rename to src/mongo/util/histogram.cpp
diff --git a/util/histogram.h b/src/mongo/util/histogram.h
similarity index 100%
rename from util/histogram.h
rename to src/mongo/util/histogram.h
diff --git a/util/intrusive_counter.cpp b/src/mongo/util/intrusive_counter.cpp
similarity index 100%
rename from util/intrusive_counter.cpp
rename to src/mongo/util/intrusive_counter.cpp
diff --git a/util/intrusive_counter.h b/src/mongo/util/intrusive_counter.h
similarity index 100%
rename from util/intrusive_counter.h
rename to src/mongo/util/intrusive_counter.h
diff --git a/util/log.cpp b/src/mongo/util/log.cpp
similarity index 100%
rename from util/log.cpp
rename to src/mongo/util/log.cpp
diff --git a/util/log.h b/src/mongo/util/log.h
similarity index 100%
rename from util/log.h
rename to src/mongo/util/log.h
diff --git a/util/logfile.cpp b/src/mongo/util/logfile.cpp
similarity index 100%
rename from util/logfile.cpp
rename to src/mongo/util/logfile.cpp
diff --git a/util/logfile.h b/src/mongo/util/logfile.h
similarity index 100%
rename from util/logfile.h
rename to src/mongo/util/logfile.h
diff --git a/util/lruishmap.h b/src/mongo/util/lruishmap.h
similarity index 100%
rename from util/lruishmap.h
rename to src/mongo/util/lruishmap.h
diff --git a/util/md5.c b/src/mongo/util/md5.c
similarity index 100%
rename from util/md5.c
rename to src/mongo/util/md5.c
diff --git a/util/md5.h b/src/mongo/util/md5.h
similarity index 100%
rename from util/md5.h
rename to src/mongo/util/md5.h
diff --git a/util/md5.hpp b/src/mongo/util/md5.hpp
similarity index 100%
rename from util/md5.hpp
rename to src/mongo/util/md5.hpp
diff --git a/util/md5main.cpp b/src/mongo/util/md5main.cpp
similarity index 100%
rename from util/md5main.cpp
rename to src/mongo/util/md5main.cpp
diff --git a/util/mmap.cpp b/src/mongo/util/mmap.cpp
similarity index 100%
rename from util/mmap.cpp
rename to src/mongo/util/mmap.cpp
diff --git a/util/mmap.h b/src/mongo/util/mmap.h
similarity index 100%
rename from util/mmap.h
rename to src/mongo/util/mmap.h
diff --git a/util/mmap_mm.cpp b/src/mongo/util/mmap_mm.cpp
similarity index 100%
rename from util/mmap_mm.cpp
rename to src/mongo/util/mmap_mm.cpp
diff --git a/util/mmap_posix.cpp b/src/mongo/util/mmap_posix.cpp
similarity index 100%
rename from util/mmap_posix.cpp
rename to src/mongo/util/mmap_posix.cpp
diff --git a/util/mmap_win.cpp b/src/mongo/util/mmap_win.cpp
similarity index 100%
rename from util/mmap_win.cpp
rename to src/mongo/util/mmap_win.cpp
diff --git a/util/mongoutils/README b/src/mongo/util/mongoutils/README
similarity index 100%
rename from util/mongoutils/README
rename to src/mongo/util/mongoutils/README
diff --git a/util/mongoutils/checksum.h b/src/mongo/util/mongoutils/checksum.h
similarity index 100%
rename from util/mongoutils/checksum.h
rename to src/mongo/util/mongoutils/checksum.h
diff --git a/util/mongoutils/hash.h b/src/mongo/util/mongoutils/hash.h
similarity index 100%
rename from util/mongoutils/hash.h
rename to src/mongo/util/mongoutils/hash.h
diff --git a/util/mongoutils/html.h b/src/mongo/util/mongoutils/html.h
similarity index 100%
rename from util/mongoutils/html.h
rename to src/mongo/util/mongoutils/html.h
diff --git a/util/mongoutils/mongoutils.vcxproj b/src/mongo/util/mongoutils/mongoutils.vcxproj
similarity index 100%
rename from util/mongoutils/mongoutils.vcxproj
rename to src/mongo/util/mongoutils/mongoutils.vcxproj
diff --git a/util/mongoutils/mongoutils.vcxproj.filters b/src/mongo/util/mongoutils/mongoutils.vcxproj.filters
similarity index 100%
rename from util/mongoutils/mongoutils.vcxproj.filters
rename to src/mongo/util/mongoutils/mongoutils.vcxproj.filters
diff --git a/util/mongoutils/str.h b/src/mongo/util/mongoutils/str.h
similarity index 100%
rename from util/mongoutils/str.h
rename to src/mongo/util/mongoutils/str.h
diff --git a/util/mongoutils/test.cpp b/src/mongo/util/mongoutils/test.cpp
similarity index 100%
rename from util/mongoutils/test.cpp
rename to src/mongo/util/mongoutils/test.cpp
diff --git a/util/moveablebuffer.h b/src/mongo/util/moveablebuffer.h
similarity index 100%
rename from util/moveablebuffer.h
rename to src/mongo/util/moveablebuffer.h
diff --git a/util/net/hostandport.h b/src/mongo/util/net/hostandport.h
similarity index 100%
rename from util/net/hostandport.h
rename to src/mongo/util/net/hostandport.h
diff --git a/util/net/httpclient.cpp b/src/mongo/util/net/httpclient.cpp
similarity index 100%
rename from util/net/httpclient.cpp
rename to src/mongo/util/net/httpclient.cpp
diff --git a/util/net/httpclient.h b/src/mongo/util/net/httpclient.h
similarity index 100%
rename from util/net/httpclient.h
rename to src/mongo/util/net/httpclient.h
diff --git a/util/net/listen.cpp b/src/mongo/util/net/listen.cpp
similarity index 100%
rename from util/net/listen.cpp
rename to src/mongo/util/net/listen.cpp
diff --git a/util/net/listen.h b/src/mongo/util/net/listen.h
similarity index 100%
rename from util/net/listen.h
rename to src/mongo/util/net/listen.h
diff --git a/util/net/message.cpp b/src/mongo/util/net/message.cpp
similarity index 100%
rename from util/net/message.cpp
rename to src/mongo/util/net/message.cpp
diff --git a/util/net/message.h b/src/mongo/util/net/message.h
similarity index 100%
rename from util/net/message.h
rename to src/mongo/util/net/message.h
diff --git a/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
similarity index 100%
rename from util/net/message_port.cpp
rename to src/mongo/util/net/message_port.cpp
diff --git a/util/net/message_port.h b/src/mongo/util/net/message_port.h
similarity index 100%
rename from util/net/message_port.h
rename to src/mongo/util/net/message_port.h
diff --git a/util/net/message_server.h b/src/mongo/util/net/message_server.h
similarity index 100%
rename from util/net/message_server.h
rename to src/mongo/util/net/message_server.h
diff --git a/util/net/message_server_asio.cpp b/src/mongo/util/net/message_server_asio.cpp
similarity index 100%
rename from util/net/message_server_asio.cpp
rename to src/mongo/util/net/message_server_asio.cpp
diff --git a/util/net/message_server_port.cpp b/src/mongo/util/net/message_server_port.cpp
similarity index 100%
rename from util/net/message_server_port.cpp
rename to src/mongo/util/net/message_server_port.cpp
diff --git a/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
similarity index 100%
rename from util/net/miniwebserver.cpp
rename to src/mongo/util/net/miniwebserver.cpp
diff --git a/util/net/miniwebserver.h b/src/mongo/util/net/miniwebserver.h
similarity index 100%
rename from util/net/miniwebserver.h
rename to src/mongo/util/net/miniwebserver.h
diff --git a/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
similarity index 100%
rename from util/net/sock.cpp
rename to src/mongo/util/net/sock.cpp
diff --git a/util/net/sock.h b/src/mongo/util/net/sock.h
similarity index 100%
rename from util/net/sock.h
rename to src/mongo/util/net/sock.h
diff --git a/util/ntservice.cpp b/src/mongo/util/ntservice.cpp
similarity index 100%
rename from util/ntservice.cpp
rename to src/mongo/util/ntservice.cpp
diff --git a/util/ntservice.h b/src/mongo/util/ntservice.h
similarity index 100%
rename from util/ntservice.h
rename to src/mongo/util/ntservice.h
diff --git a/util/optime.h b/src/mongo/util/optime.h
similarity index 100%
rename from util/optime.h
rename to src/mongo/util/optime.h
diff --git a/util/password.cpp b/src/mongo/util/password.cpp
similarity index 100%
rename from util/password.cpp
rename to src/mongo/util/password.cpp
diff --git a/util/password.h b/src/mongo/util/password.h
similarity index 100%
rename from util/password.h
rename to src/mongo/util/password.h
diff --git a/util/paths.h b/src/mongo/util/paths.h
similarity index 100%
rename from util/paths.h
rename to src/mongo/util/paths.h
diff --git a/util/processinfo.cpp b/src/mongo/util/processinfo.cpp
similarity index 100%
rename from util/processinfo.cpp
rename to src/mongo/util/processinfo.cpp
diff --git a/util/processinfo.h b/src/mongo/util/processinfo.h
similarity index 100%
rename from util/processinfo.h
rename to src/mongo/util/processinfo.h
diff --git a/util/processinfo_darwin.cpp b/src/mongo/util/processinfo_darwin.cpp
similarity index 100%
rename from util/processinfo_darwin.cpp
rename to src/mongo/util/processinfo_darwin.cpp
diff --git a/util/processinfo_linux2.cpp b/src/mongo/util/processinfo_linux2.cpp
similarity index 100%
rename from util/processinfo_linux2.cpp
rename to src/mongo/util/processinfo_linux2.cpp
diff --git a/util/processinfo_none.cpp b/src/mongo/util/processinfo_none.cpp
similarity index 100%
rename from util/processinfo_none.cpp
rename to src/mongo/util/processinfo_none.cpp
diff --git a/util/processinfo_win32.cpp b/src/mongo/util/processinfo_win32.cpp
similarity index 100%
rename from util/processinfo_win32.cpp
rename to src/mongo/util/processinfo_win32.cpp
diff --git a/util/queue.h b/src/mongo/util/queue.h
similarity index 100%
rename from util/queue.h
rename to src/mongo/util/queue.h
diff --git a/util/ramlog.cpp b/src/mongo/util/ramlog.cpp
similarity index 100%
rename from util/ramlog.cpp
rename to src/mongo/util/ramlog.cpp
diff --git a/util/ramlog.h b/src/mongo/util/ramlog.h
similarity index 100%
rename from util/ramlog.h
rename to src/mongo/util/ramlog.h
diff --git a/util/scopeguard.h b/src/mongo/util/scopeguard.h
similarity index 100%
rename from util/scopeguard.h
rename to src/mongo/util/scopeguard.h
diff --git a/util/signal_handlers.cpp b/src/mongo/util/signal_handlers.cpp
similarity index 100%
rename from util/signal_handlers.cpp
rename to src/mongo/util/signal_handlers.cpp
diff --git a/util/signal_handlers.h b/src/mongo/util/signal_handlers.h
similarity index 100%
rename from util/signal_handlers.h
rename to src/mongo/util/signal_handlers.h
diff --git a/util/string_writer.h b/src/mongo/util/string_writer.h
similarity index 100%
rename from util/string_writer.h
rename to src/mongo/util/string_writer.h
diff --git a/util/stringutils.cpp b/src/mongo/util/stringutils.cpp
similarity index 100%
rename from util/stringutils.cpp
rename to src/mongo/util/stringutils.cpp
diff --git a/util/stringutils.h b/src/mongo/util/stringutils.h
similarity index 100%
rename from util/stringutils.h
rename to src/mongo/util/stringutils.h
diff --git a/util/systeminfo.h b/src/mongo/util/systeminfo.h
similarity index 100%
rename from util/systeminfo.h
rename to src/mongo/util/systeminfo.h
diff --git a/util/systeminfo_linux2.cpp b/src/mongo/util/systeminfo_linux2.cpp
similarity index 100%
rename from util/systeminfo_linux2.cpp
rename to src/mongo/util/systeminfo_linux2.cpp
diff --git a/util/systeminfo_none.cpp b/src/mongo/util/systeminfo_none.cpp
similarity index 100%
rename from util/systeminfo_none.cpp
rename to src/mongo/util/systeminfo_none.cpp
diff --git a/util/systeminfo_win32.cpp b/src/mongo/util/systeminfo_win32.cpp
similarity index 100%
rename from util/systeminfo_win32.cpp
rename to src/mongo/util/systeminfo_win32.cpp
diff --git a/util/text.cpp b/src/mongo/util/text.cpp
similarity index 100%
rename from util/text.cpp
rename to src/mongo/util/text.cpp
diff --git a/util/text.h b/src/mongo/util/text.h
similarity index 100%
rename from util/text.h
rename to src/mongo/util/text.h
diff --git a/util/time_support.h b/src/mongo/util/time_support.h
similarity index 100%
rename from util/time_support.h
rename to src/mongo/util/time_support.h
diff --git a/util/timer.h b/src/mongo/util/timer.h
similarity index 100%
rename from util/timer.h
rename to src/mongo/util/timer.h
diff --git a/util/unittest.h b/src/mongo/util/unittest.h
similarity index 100%
rename from util/unittest.h
rename to src/mongo/util/unittest.h
diff --git a/util/util.cpp b/src/mongo/util/util.cpp
similarity index 100%
rename from util/util.cpp
rename to src/mongo/util/util.cpp
diff --git a/util/version.cpp b/src/mongo/util/version.cpp
similarity index 100%
rename from util/version.cpp
rename to src/mongo/util/version.cpp
diff --git a/util/version.h b/src/mongo/util/version.h
similarity index 100%
rename from util/version.h
rename to src/mongo/util/version.h
diff --git a/util/winutil.h b/src/mongo/util/winutil.h
similarity index 100%
rename from util/winutil.h
rename to src/mongo/util/winutil.h
diff --git a/third_party/README b/src/third_party/README
similarity index 100%
rename from third_party/README
rename to src/third_party/README
diff --git a/third_party/js-1.7/Makefile.in b/src/third_party/js-1.7/Makefile.in
similarity index 100%
rename from third_party/js-1.7/Makefile.in
rename to src/third_party/js-1.7/Makefile.in
diff --git a/third_party/js-1.7/Makefile.ref b/src/third_party/js-1.7/Makefile.ref
similarity index 100%
rename from third_party/js-1.7/Makefile.ref
rename to src/third_party/js-1.7/Makefile.ref
diff --git a/third_party/js-1.7/README.html b/src/third_party/js-1.7/README.html
similarity index 100%
rename from third_party/js-1.7/README.html
rename to src/third_party/js-1.7/README.html
diff --git a/third_party/js-1.7/SpiderMonkey.rsp b/src/third_party/js-1.7/SpiderMonkey.rsp
similarity index 100%
rename from third_party/js-1.7/SpiderMonkey.rsp
rename to src/third_party/js-1.7/SpiderMonkey.rsp
diff --git a/third_party/js-1.7/Y.js b/src/third_party/js-1.7/Y.js
similarity index 100%
rename from third_party/js-1.7/Y.js
rename to src/third_party/js-1.7/Y.js
diff --git a/third_party/js-1.7/config.mk b/src/third_party/js-1.7/config.mk
similarity index 100%
rename from third_party/js-1.7/config.mk
rename to src/third_party/js-1.7/config.mk
diff --git a/third_party/js-1.7/config/AIX4.1.mk b/src/third_party/js-1.7/config/AIX4.1.mk
similarity index 100%
rename from third_party/js-1.7/config/AIX4.1.mk
rename to src/third_party/js-1.7/config/AIX4.1.mk
diff --git a/third_party/js-1.7/config/AIX4.2.mk b/src/third_party/js-1.7/config/AIX4.2.mk
similarity index 100%
rename from third_party/js-1.7/config/AIX4.2.mk
rename to src/third_party/js-1.7/config/AIX4.2.mk
diff --git a/third_party/js-1.7/config/AIX4.3.mk b/src/third_party/js-1.7/config/AIX4.3.mk
similarity index 100%
rename from third_party/js-1.7/config/AIX4.3.mk
rename to src/third_party/js-1.7/config/AIX4.3.mk
diff --git a/third_party/js-1.7/config/CVS/Entries b/src/third_party/js-1.7/config/CVS/Entries
similarity index 100%
rename from third_party/js-1.7/config/CVS/Entries
rename to src/third_party/js-1.7/config/CVS/Entries
diff --git a/third_party/js-1.7/config/CVS/Repository b/src/third_party/js-1.7/config/CVS/Repository
similarity index 100%
rename from third_party/js-1.7/config/CVS/Repository
rename to src/third_party/js-1.7/config/CVS/Repository
diff --git a/third_party/js-1.7/config/CVS/Root b/src/third_party/js-1.7/config/CVS/Root
similarity index 100%
rename from third_party/js-1.7/config/CVS/Root
rename to src/third_party/js-1.7/config/CVS/Root
diff --git a/third_party/js-1.7/config/CVS/Tag b/src/third_party/js-1.7/config/CVS/Tag
similarity index 100%
rename from third_party/js-1.7/config/CVS/Tag
rename to src/third_party/js-1.7/config/CVS/Tag
diff --git a/third_party/js-1.7/config/Darwin.mk b/src/third_party/js-1.7/config/Darwin.mk
similarity index 100%
rename from third_party/js-1.7/config/Darwin.mk
rename to src/third_party/js-1.7/config/Darwin.mk
diff --git a/third_party/js-1.7/config/Darwin1.3.mk b/src/third_party/js-1.7/config/Darwin1.3.mk
similarity index 100%
rename from third_party/js-1.7/config/Darwin1.3.mk
rename to src/third_party/js-1.7/config/Darwin1.3.mk
diff --git a/third_party/js-1.7/config/Darwin1.4.mk b/src/third_party/js-1.7/config/Darwin1.4.mk
similarity index 100%
rename from third_party/js-1.7/config/Darwin1.4.mk
rename to src/third_party/js-1.7/config/Darwin1.4.mk
diff --git a/third_party/js-1.7/config/Darwin5.2.mk b/src/third_party/js-1.7/config/Darwin5.2.mk
similarity index 100%
rename from third_party/js-1.7/config/Darwin5.2.mk
rename to src/third_party/js-1.7/config/Darwin5.2.mk
diff --git a/third_party/js-1.7/config/Darwin5.3.mk b/src/third_party/js-1.7/config/Darwin5.3.mk
similarity index 100%
rename from third_party/js-1.7/config/Darwin5.3.mk
rename to src/third_party/js-1.7/config/Darwin5.3.mk
diff --git a/third_party/js-1.7/config/HP-UXB.10.10.mk b/src/third_party/js-1.7/config/HP-UXB.10.10.mk
similarity index 100%
rename from third_party/js-1.7/config/HP-UXB.10.10.mk
rename to src/third_party/js-1.7/config/HP-UXB.10.10.mk
diff --git a/third_party/js-1.7/config/HP-UXB.10.20.mk b/src/third_party/js-1.7/config/HP-UXB.10.20.mk
similarity index 100%
rename from third_party/js-1.7/config/HP-UXB.10.20.mk
rename to src/third_party/js-1.7/config/HP-UXB.10.20.mk
diff --git a/third_party/js-1.7/config/HP-UXB.11.00.mk b/src/third_party/js-1.7/config/HP-UXB.11.00.mk
similarity index 100%
rename from third_party/js-1.7/config/HP-UXB.11.00.mk
rename to src/third_party/js-1.7/config/HP-UXB.11.00.mk
diff --git a/third_party/js-1.7/config/IRIX.mk b/src/third_party/js-1.7/config/IRIX.mk
similarity index 100%
rename from third_party/js-1.7/config/IRIX.mk
rename to src/third_party/js-1.7/config/IRIX.mk
diff --git a/third_party/js-1.7/config/IRIX5.3.mk b/src/third_party/js-1.7/config/IRIX5.3.mk
similarity index 100%
rename from third_party/js-1.7/config/IRIX5.3.mk
rename to src/third_party/js-1.7/config/IRIX5.3.mk
diff --git a/third_party/js-1.7/config/IRIX6.1.mk b/src/third_party/js-1.7/config/IRIX6.1.mk
similarity index 100%
rename from third_party/js-1.7/config/IRIX6.1.mk
rename to src/third_party/js-1.7/config/IRIX6.1.mk
diff --git a/third_party/js-1.7/config/IRIX6.2.mk b/src/third_party/js-1.7/config/IRIX6.2.mk
similarity index 100%
rename from third_party/js-1.7/config/IRIX6.2.mk
rename to src/third_party/js-1.7/config/IRIX6.2.mk
diff --git a/third_party/js-1.7/config/IRIX6.3.mk b/src/third_party/js-1.7/config/IRIX6.3.mk
similarity index 100%
rename from third_party/js-1.7/config/IRIX6.3.mk
rename to src/third_party/js-1.7/config/IRIX6.3.mk
diff --git a/third_party/js-1.7/config/IRIX6.5.mk b/src/third_party/js-1.7/config/IRIX6.5.mk
similarity index 100%
rename from third_party/js-1.7/config/IRIX6.5.mk
rename to src/third_party/js-1.7/config/IRIX6.5.mk
diff --git a/third_party/js-1.7/config/Linux_All.mk b/src/third_party/js-1.7/config/Linux_All.mk
similarity index 100%
rename from third_party/js-1.7/config/Linux_All.mk
rename to src/third_party/js-1.7/config/Linux_All.mk
diff --git a/third_party/js-1.7/config/Mac_OS10.0.mk b/src/third_party/js-1.7/config/Mac_OS10.0.mk
similarity index 100%
rename from third_party/js-1.7/config/Mac_OS10.0.mk
rename to src/third_party/js-1.7/config/Mac_OS10.0.mk
diff --git a/third_party/js-1.7/config/OSF1V4.0.mk b/src/third_party/js-1.7/config/OSF1V4.0.mk
similarity index 100%
rename from third_party/js-1.7/config/OSF1V4.0.mk
rename to src/third_party/js-1.7/config/OSF1V4.0.mk
diff --git a/third_party/js-1.7/config/OSF1V5.0.mk b/src/third_party/js-1.7/config/OSF1V5.0.mk
similarity index 100%
rename from third_party/js-1.7/config/OSF1V5.0.mk
rename to src/third_party/js-1.7/config/OSF1V5.0.mk
diff --git a/third_party/js-1.7/config/SunOS4.1.4.mk b/src/third_party/js-1.7/config/SunOS4.1.4.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS4.1.4.mk
rename to src/third_party/js-1.7/config/SunOS4.1.4.mk
diff --git a/third_party/js-1.7/config/SunOS5.3.mk b/src/third_party/js-1.7/config/SunOS5.3.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.3.mk
rename to src/third_party/js-1.7/config/SunOS5.3.mk
diff --git a/third_party/js-1.7/config/SunOS5.4.mk b/src/third_party/js-1.7/config/SunOS5.4.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.4.mk
rename to src/third_party/js-1.7/config/SunOS5.4.mk
diff --git a/third_party/js-1.7/config/SunOS5.5.1.mk b/src/third_party/js-1.7/config/SunOS5.5.1.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.5.1.mk
rename to src/third_party/js-1.7/config/SunOS5.5.1.mk
diff --git a/third_party/js-1.7/config/SunOS5.5.mk b/src/third_party/js-1.7/config/SunOS5.5.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.5.mk
rename to src/third_party/js-1.7/config/SunOS5.5.mk
diff --git a/third_party/js-1.7/config/SunOS5.6.mk b/src/third_party/js-1.7/config/SunOS5.6.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.6.mk
rename to src/third_party/js-1.7/config/SunOS5.6.mk
diff --git a/third_party/js-1.7/config/SunOS5.7.mk b/src/third_party/js-1.7/config/SunOS5.7.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.7.mk
rename to src/third_party/js-1.7/config/SunOS5.7.mk
diff --git a/third_party/js-1.7/config/SunOS5.8.mk b/src/third_party/js-1.7/config/SunOS5.8.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.8.mk
rename to src/third_party/js-1.7/config/SunOS5.8.mk
diff --git a/third_party/js-1.7/config/SunOS5.9.mk b/src/third_party/js-1.7/config/SunOS5.9.mk
similarity index 100%
rename from third_party/js-1.7/config/SunOS5.9.mk
rename to src/third_party/js-1.7/config/SunOS5.9.mk
diff --git a/third_party/js-1.7/config/WINNT4.0.mk b/src/third_party/js-1.7/config/WINNT4.0.mk
similarity index 100%
rename from third_party/js-1.7/config/WINNT4.0.mk
rename to src/third_party/js-1.7/config/WINNT4.0.mk
diff --git a/third_party/js-1.7/config/WINNT5.0.mk b/src/third_party/js-1.7/config/WINNT5.0.mk
similarity index 100%
rename from third_party/js-1.7/config/WINNT5.0.mk
rename to src/third_party/js-1.7/config/WINNT5.0.mk
diff --git a/third_party/js-1.7/config/WINNT5.1.mk b/src/third_party/js-1.7/config/WINNT5.1.mk
similarity index 100%
rename from third_party/js-1.7/config/WINNT5.1.mk
rename to src/third_party/js-1.7/config/WINNT5.1.mk
diff --git a/third_party/js-1.7/config/WINNT5.2.mk b/src/third_party/js-1.7/config/WINNT5.2.mk
similarity index 100%
rename from third_party/js-1.7/config/WINNT5.2.mk
rename to src/third_party/js-1.7/config/WINNT5.2.mk
diff --git a/third_party/js-1.7/config/dgux.mk b/src/third_party/js-1.7/config/dgux.mk
similarity index 100%
rename from third_party/js-1.7/config/dgux.mk
rename to src/third_party/js-1.7/config/dgux.mk
diff --git a/third_party/js-1.7/fdlibm/.cvsignore b/src/third_party/js-1.7/fdlibm/.cvsignore
similarity index 100%
rename from third_party/js-1.7/fdlibm/.cvsignore
rename to src/third_party/js-1.7/fdlibm/.cvsignore
diff --git a/third_party/js-1.7/fdlibm/CVS/Entries b/src/third_party/js-1.7/fdlibm/CVS/Entries
similarity index 100%
rename from third_party/js-1.7/fdlibm/CVS/Entries
rename to src/third_party/js-1.7/fdlibm/CVS/Entries
diff --git a/third_party/js-1.7/fdlibm/CVS/Repository b/src/third_party/js-1.7/fdlibm/CVS/Repository
similarity index 100%
rename from third_party/js-1.7/fdlibm/CVS/Repository
rename to src/third_party/js-1.7/fdlibm/CVS/Repository
diff --git a/third_party/js-1.7/fdlibm/CVS/Root b/src/third_party/js-1.7/fdlibm/CVS/Root
similarity index 100%
rename from third_party/js-1.7/fdlibm/CVS/Root
rename to src/third_party/js-1.7/fdlibm/CVS/Root
diff --git a/third_party/js-1.7/fdlibm/CVS/Tag b/src/third_party/js-1.7/fdlibm/CVS/Tag
similarity index 100%
rename from third_party/js-1.7/fdlibm/CVS/Tag
rename to src/third_party/js-1.7/fdlibm/CVS/Tag
diff --git a/third_party/js-1.7/fdlibm/Makefile.in b/src/third_party/js-1.7/fdlibm/Makefile.in
similarity index 100%
rename from third_party/js-1.7/fdlibm/Makefile.in
rename to src/third_party/js-1.7/fdlibm/Makefile.in
diff --git a/third_party/js-1.7/fdlibm/Makefile.ref b/src/third_party/js-1.7/fdlibm/Makefile.ref
similarity index 100%
rename from third_party/js-1.7/fdlibm/Makefile.ref
rename to src/third_party/js-1.7/fdlibm/Makefile.ref
diff --git a/third_party/js-1.7/fdlibm/e_acos.c b/src/third_party/js-1.7/fdlibm/e_acos.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_acos.c
rename to src/third_party/js-1.7/fdlibm/e_acos.c
diff --git a/third_party/js-1.7/fdlibm/e_acosh.c b/src/third_party/js-1.7/fdlibm/e_acosh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_acosh.c
rename to src/third_party/js-1.7/fdlibm/e_acosh.c
diff --git a/third_party/js-1.7/fdlibm/e_asin.c b/src/third_party/js-1.7/fdlibm/e_asin.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_asin.c
rename to src/third_party/js-1.7/fdlibm/e_asin.c
diff --git a/third_party/js-1.7/fdlibm/e_atan2.c b/src/third_party/js-1.7/fdlibm/e_atan2.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_atan2.c
rename to src/third_party/js-1.7/fdlibm/e_atan2.c
diff --git a/third_party/js-1.7/fdlibm/e_atanh.c b/src/third_party/js-1.7/fdlibm/e_atanh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_atanh.c
rename to src/third_party/js-1.7/fdlibm/e_atanh.c
diff --git a/third_party/js-1.7/fdlibm/e_cosh.c b/src/third_party/js-1.7/fdlibm/e_cosh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_cosh.c
rename to src/third_party/js-1.7/fdlibm/e_cosh.c
diff --git a/third_party/js-1.7/fdlibm/e_exp.c b/src/third_party/js-1.7/fdlibm/e_exp.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_exp.c
rename to src/third_party/js-1.7/fdlibm/e_exp.c
diff --git a/third_party/js-1.7/fdlibm/e_fmod.c b/src/third_party/js-1.7/fdlibm/e_fmod.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_fmod.c
rename to src/third_party/js-1.7/fdlibm/e_fmod.c
diff --git a/third_party/js-1.7/fdlibm/e_gamma.c b/src/third_party/js-1.7/fdlibm/e_gamma.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_gamma.c
rename to src/third_party/js-1.7/fdlibm/e_gamma.c
diff --git a/third_party/js-1.7/fdlibm/e_gamma_r.c b/src/third_party/js-1.7/fdlibm/e_gamma_r.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_gamma_r.c
rename to src/third_party/js-1.7/fdlibm/e_gamma_r.c
diff --git a/third_party/js-1.7/fdlibm/e_hypot.c b/src/third_party/js-1.7/fdlibm/e_hypot.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_hypot.c
rename to src/third_party/js-1.7/fdlibm/e_hypot.c
diff --git a/third_party/js-1.7/fdlibm/e_j0.c b/src/third_party/js-1.7/fdlibm/e_j0.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_j0.c
rename to src/third_party/js-1.7/fdlibm/e_j0.c
diff --git a/third_party/js-1.7/fdlibm/e_j1.c b/src/third_party/js-1.7/fdlibm/e_j1.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_j1.c
rename to src/third_party/js-1.7/fdlibm/e_j1.c
diff --git a/third_party/js-1.7/fdlibm/e_jn.c b/src/third_party/js-1.7/fdlibm/e_jn.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_jn.c
rename to src/third_party/js-1.7/fdlibm/e_jn.c
diff --git a/third_party/js-1.7/fdlibm/e_lgamma.c b/src/third_party/js-1.7/fdlibm/e_lgamma.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_lgamma.c
rename to src/third_party/js-1.7/fdlibm/e_lgamma.c
diff --git a/third_party/js-1.7/fdlibm/e_lgamma_r.c b/src/third_party/js-1.7/fdlibm/e_lgamma_r.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_lgamma_r.c
rename to src/third_party/js-1.7/fdlibm/e_lgamma_r.c
diff --git a/third_party/js-1.7/fdlibm/e_log.c b/src/third_party/js-1.7/fdlibm/e_log.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_log.c
rename to src/third_party/js-1.7/fdlibm/e_log.c
diff --git a/third_party/js-1.7/fdlibm/e_log10.c b/src/third_party/js-1.7/fdlibm/e_log10.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_log10.c
rename to src/third_party/js-1.7/fdlibm/e_log10.c
diff --git a/third_party/js-1.7/fdlibm/e_pow.c b/src/third_party/js-1.7/fdlibm/e_pow.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_pow.c
rename to src/third_party/js-1.7/fdlibm/e_pow.c
diff --git a/third_party/js-1.7/fdlibm/e_rem_pio2.c b/src/third_party/js-1.7/fdlibm/e_rem_pio2.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_rem_pio2.c
rename to src/third_party/js-1.7/fdlibm/e_rem_pio2.c
diff --git a/third_party/js-1.7/fdlibm/e_remainder.c b/src/third_party/js-1.7/fdlibm/e_remainder.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_remainder.c
rename to src/third_party/js-1.7/fdlibm/e_remainder.c
diff --git a/third_party/js-1.7/fdlibm/e_scalb.c b/src/third_party/js-1.7/fdlibm/e_scalb.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_scalb.c
rename to src/third_party/js-1.7/fdlibm/e_scalb.c
diff --git a/third_party/js-1.7/fdlibm/e_sinh.c b/src/third_party/js-1.7/fdlibm/e_sinh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_sinh.c
rename to src/third_party/js-1.7/fdlibm/e_sinh.c
diff --git a/third_party/js-1.7/fdlibm/e_sqrt.c b/src/third_party/js-1.7/fdlibm/e_sqrt.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/e_sqrt.c
rename to src/third_party/js-1.7/fdlibm/e_sqrt.c
diff --git a/third_party/js-1.7/fdlibm/fdlibm.h b/src/third_party/js-1.7/fdlibm/fdlibm.h
similarity index 100%
rename from third_party/js-1.7/fdlibm/fdlibm.h
rename to src/third_party/js-1.7/fdlibm/fdlibm.h
diff --git a/third_party/js-1.7/fdlibm/fdlibm.mak b/src/third_party/js-1.7/fdlibm/fdlibm.mak
similarity index 100%
rename from third_party/js-1.7/fdlibm/fdlibm.mak
rename to src/third_party/js-1.7/fdlibm/fdlibm.mak
diff --git a/third_party/js-1.7/fdlibm/fdlibm.mdp b/src/third_party/js-1.7/fdlibm/fdlibm.mdp
similarity index 100%
rename from third_party/js-1.7/fdlibm/fdlibm.mdp
rename to src/third_party/js-1.7/fdlibm/fdlibm.mdp
diff --git a/third_party/js-1.7/fdlibm/k_cos.c b/src/third_party/js-1.7/fdlibm/k_cos.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/k_cos.c
rename to src/third_party/js-1.7/fdlibm/k_cos.c
diff --git a/third_party/js-1.7/fdlibm/k_rem_pio2.c b/src/third_party/js-1.7/fdlibm/k_rem_pio2.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/k_rem_pio2.c
rename to src/third_party/js-1.7/fdlibm/k_rem_pio2.c
diff --git a/third_party/js-1.7/fdlibm/k_sin.c b/src/third_party/js-1.7/fdlibm/k_sin.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/k_sin.c
rename to src/third_party/js-1.7/fdlibm/k_sin.c
diff --git a/third_party/js-1.7/fdlibm/k_standard.c b/src/third_party/js-1.7/fdlibm/k_standard.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/k_standard.c
rename to src/third_party/js-1.7/fdlibm/k_standard.c
diff --git a/third_party/js-1.7/fdlibm/k_tan.c b/src/third_party/js-1.7/fdlibm/k_tan.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/k_tan.c
rename to src/third_party/js-1.7/fdlibm/k_tan.c
diff --git a/third_party/js-1.7/fdlibm/s_asinh.c b/src/third_party/js-1.7/fdlibm/s_asinh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_asinh.c
rename to src/third_party/js-1.7/fdlibm/s_asinh.c
diff --git a/third_party/js-1.7/fdlibm/s_atan.c b/src/third_party/js-1.7/fdlibm/s_atan.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_atan.c
rename to src/third_party/js-1.7/fdlibm/s_atan.c
diff --git a/third_party/js-1.7/fdlibm/s_cbrt.c b/src/third_party/js-1.7/fdlibm/s_cbrt.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_cbrt.c
rename to src/third_party/js-1.7/fdlibm/s_cbrt.c
diff --git a/third_party/js-1.7/fdlibm/s_ceil.c b/src/third_party/js-1.7/fdlibm/s_ceil.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_ceil.c
rename to src/third_party/js-1.7/fdlibm/s_ceil.c
diff --git a/third_party/js-1.7/fdlibm/s_copysign.c b/src/third_party/js-1.7/fdlibm/s_copysign.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_copysign.c
rename to src/third_party/js-1.7/fdlibm/s_copysign.c
diff --git a/third_party/js-1.7/fdlibm/s_cos.c b/src/third_party/js-1.7/fdlibm/s_cos.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_cos.c
rename to src/third_party/js-1.7/fdlibm/s_cos.c
diff --git a/third_party/js-1.7/fdlibm/s_erf.c b/src/third_party/js-1.7/fdlibm/s_erf.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_erf.c
rename to src/third_party/js-1.7/fdlibm/s_erf.c
diff --git a/third_party/js-1.7/fdlibm/s_expm1.c b/src/third_party/js-1.7/fdlibm/s_expm1.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_expm1.c
rename to src/third_party/js-1.7/fdlibm/s_expm1.c
diff --git a/third_party/js-1.7/fdlibm/s_fabs.c b/src/third_party/js-1.7/fdlibm/s_fabs.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_fabs.c
rename to src/third_party/js-1.7/fdlibm/s_fabs.c
diff --git a/third_party/js-1.7/fdlibm/s_finite.c b/src/third_party/js-1.7/fdlibm/s_finite.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_finite.c
rename to src/third_party/js-1.7/fdlibm/s_finite.c
diff --git a/third_party/js-1.7/fdlibm/s_floor.c b/src/third_party/js-1.7/fdlibm/s_floor.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_floor.c
rename to src/third_party/js-1.7/fdlibm/s_floor.c
diff --git a/third_party/js-1.7/fdlibm/s_frexp.c b/src/third_party/js-1.7/fdlibm/s_frexp.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_frexp.c
rename to src/third_party/js-1.7/fdlibm/s_frexp.c
diff --git a/third_party/js-1.7/fdlibm/s_ilogb.c b/src/third_party/js-1.7/fdlibm/s_ilogb.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_ilogb.c
rename to src/third_party/js-1.7/fdlibm/s_ilogb.c
diff --git a/third_party/js-1.7/fdlibm/s_isnan.c b/src/third_party/js-1.7/fdlibm/s_isnan.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_isnan.c
rename to src/third_party/js-1.7/fdlibm/s_isnan.c
diff --git a/third_party/js-1.7/fdlibm/s_ldexp.c b/src/third_party/js-1.7/fdlibm/s_ldexp.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_ldexp.c
rename to src/third_party/js-1.7/fdlibm/s_ldexp.c
diff --git a/third_party/js-1.7/fdlibm/s_lib_version.c b/src/third_party/js-1.7/fdlibm/s_lib_version.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_lib_version.c
rename to src/third_party/js-1.7/fdlibm/s_lib_version.c
diff --git a/third_party/js-1.7/fdlibm/s_log1p.c b/src/third_party/js-1.7/fdlibm/s_log1p.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_log1p.c
rename to src/third_party/js-1.7/fdlibm/s_log1p.c
diff --git a/third_party/js-1.7/fdlibm/s_logb.c b/src/third_party/js-1.7/fdlibm/s_logb.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_logb.c
rename to src/third_party/js-1.7/fdlibm/s_logb.c
diff --git a/third_party/js-1.7/fdlibm/s_matherr.c b/src/third_party/js-1.7/fdlibm/s_matherr.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_matherr.c
rename to src/third_party/js-1.7/fdlibm/s_matherr.c
diff --git a/third_party/js-1.7/fdlibm/s_modf.c b/src/third_party/js-1.7/fdlibm/s_modf.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_modf.c
rename to src/third_party/js-1.7/fdlibm/s_modf.c
diff --git a/third_party/js-1.7/fdlibm/s_nextafter.c b/src/third_party/js-1.7/fdlibm/s_nextafter.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_nextafter.c
rename to src/third_party/js-1.7/fdlibm/s_nextafter.c
diff --git a/third_party/js-1.7/fdlibm/s_rint.c b/src/third_party/js-1.7/fdlibm/s_rint.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_rint.c
rename to src/third_party/js-1.7/fdlibm/s_rint.c
diff --git a/third_party/js-1.7/fdlibm/s_scalbn.c b/src/third_party/js-1.7/fdlibm/s_scalbn.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_scalbn.c
rename to src/third_party/js-1.7/fdlibm/s_scalbn.c
diff --git a/third_party/js-1.7/fdlibm/s_signgam.c b/src/third_party/js-1.7/fdlibm/s_signgam.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_signgam.c
rename to src/third_party/js-1.7/fdlibm/s_signgam.c
diff --git a/third_party/js-1.7/fdlibm/s_significand.c b/src/third_party/js-1.7/fdlibm/s_significand.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_significand.c
rename to src/third_party/js-1.7/fdlibm/s_significand.c
diff --git a/third_party/js-1.7/fdlibm/s_sin.c b/src/third_party/js-1.7/fdlibm/s_sin.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_sin.c
rename to src/third_party/js-1.7/fdlibm/s_sin.c
diff --git a/third_party/js-1.7/fdlibm/s_tan.c b/src/third_party/js-1.7/fdlibm/s_tan.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_tan.c
rename to src/third_party/js-1.7/fdlibm/s_tan.c
diff --git a/third_party/js-1.7/fdlibm/s_tanh.c b/src/third_party/js-1.7/fdlibm/s_tanh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/s_tanh.c
rename to src/third_party/js-1.7/fdlibm/s_tanh.c
diff --git a/third_party/js-1.7/fdlibm/w_acos.c b/src/third_party/js-1.7/fdlibm/w_acos.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_acos.c
rename to src/third_party/js-1.7/fdlibm/w_acos.c
diff --git a/third_party/js-1.7/fdlibm/w_acosh.c b/src/third_party/js-1.7/fdlibm/w_acosh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_acosh.c
rename to src/third_party/js-1.7/fdlibm/w_acosh.c
diff --git a/third_party/js-1.7/fdlibm/w_asin.c b/src/third_party/js-1.7/fdlibm/w_asin.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_asin.c
rename to src/third_party/js-1.7/fdlibm/w_asin.c
diff --git a/third_party/js-1.7/fdlibm/w_atan2.c b/src/third_party/js-1.7/fdlibm/w_atan2.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_atan2.c
rename to src/third_party/js-1.7/fdlibm/w_atan2.c
diff --git a/third_party/js-1.7/fdlibm/w_atanh.c b/src/third_party/js-1.7/fdlibm/w_atanh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_atanh.c
rename to src/third_party/js-1.7/fdlibm/w_atanh.c
diff --git a/third_party/js-1.7/fdlibm/w_cosh.c b/src/third_party/js-1.7/fdlibm/w_cosh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_cosh.c
rename to src/third_party/js-1.7/fdlibm/w_cosh.c
diff --git a/third_party/js-1.7/fdlibm/w_exp.c b/src/third_party/js-1.7/fdlibm/w_exp.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_exp.c
rename to src/third_party/js-1.7/fdlibm/w_exp.c
diff --git a/third_party/js-1.7/fdlibm/w_fmod.c b/src/third_party/js-1.7/fdlibm/w_fmod.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_fmod.c
rename to src/third_party/js-1.7/fdlibm/w_fmod.c
diff --git a/third_party/js-1.7/fdlibm/w_gamma.c b/src/third_party/js-1.7/fdlibm/w_gamma.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_gamma.c
rename to src/third_party/js-1.7/fdlibm/w_gamma.c
diff --git a/third_party/js-1.7/fdlibm/w_gamma_r.c b/src/third_party/js-1.7/fdlibm/w_gamma_r.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_gamma_r.c
rename to src/third_party/js-1.7/fdlibm/w_gamma_r.c
diff --git a/third_party/js-1.7/fdlibm/w_hypot.c b/src/third_party/js-1.7/fdlibm/w_hypot.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_hypot.c
rename to src/third_party/js-1.7/fdlibm/w_hypot.c
diff --git a/third_party/js-1.7/fdlibm/w_j0.c b/src/third_party/js-1.7/fdlibm/w_j0.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_j0.c
rename to src/third_party/js-1.7/fdlibm/w_j0.c
diff --git a/third_party/js-1.7/fdlibm/w_j1.c b/src/third_party/js-1.7/fdlibm/w_j1.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_j1.c
rename to src/third_party/js-1.7/fdlibm/w_j1.c
diff --git a/third_party/js-1.7/fdlibm/w_jn.c b/src/third_party/js-1.7/fdlibm/w_jn.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_jn.c
rename to src/third_party/js-1.7/fdlibm/w_jn.c
diff --git a/third_party/js-1.7/fdlibm/w_lgamma.c b/src/third_party/js-1.7/fdlibm/w_lgamma.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_lgamma.c
rename to src/third_party/js-1.7/fdlibm/w_lgamma.c
diff --git a/third_party/js-1.7/fdlibm/w_lgamma_r.c b/src/third_party/js-1.7/fdlibm/w_lgamma_r.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_lgamma_r.c
rename to src/third_party/js-1.7/fdlibm/w_lgamma_r.c
diff --git a/third_party/js-1.7/fdlibm/w_log.c b/src/third_party/js-1.7/fdlibm/w_log.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_log.c
rename to src/third_party/js-1.7/fdlibm/w_log.c
diff --git a/third_party/js-1.7/fdlibm/w_log10.c b/src/third_party/js-1.7/fdlibm/w_log10.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_log10.c
rename to src/third_party/js-1.7/fdlibm/w_log10.c
diff --git a/third_party/js-1.7/fdlibm/w_pow.c b/src/third_party/js-1.7/fdlibm/w_pow.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_pow.c
rename to src/third_party/js-1.7/fdlibm/w_pow.c
diff --git a/third_party/js-1.7/fdlibm/w_remainder.c b/src/third_party/js-1.7/fdlibm/w_remainder.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_remainder.c
rename to src/third_party/js-1.7/fdlibm/w_remainder.c
diff --git a/third_party/js-1.7/fdlibm/w_scalb.c b/src/third_party/js-1.7/fdlibm/w_scalb.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_scalb.c
rename to src/third_party/js-1.7/fdlibm/w_scalb.c
diff --git a/third_party/js-1.7/fdlibm/w_sinh.c b/src/third_party/js-1.7/fdlibm/w_sinh.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_sinh.c
rename to src/third_party/js-1.7/fdlibm/w_sinh.c
diff --git a/third_party/js-1.7/fdlibm/w_sqrt.c b/src/third_party/js-1.7/fdlibm/w_sqrt.c
similarity index 100%
rename from third_party/js-1.7/fdlibm/w_sqrt.c
rename to src/third_party/js-1.7/fdlibm/w_sqrt.c
diff --git a/third_party/js-1.7/js.c b/src/third_party/js-1.7/js.c
similarity index 100%
rename from third_party/js-1.7/js.c
rename to src/third_party/js-1.7/js.c
diff --git a/third_party/js-1.7/js.mak b/src/third_party/js-1.7/js.mak
similarity index 100%
rename from third_party/js-1.7/js.mak
rename to src/third_party/js-1.7/js.mak
diff --git a/third_party/js-1.7/js.mdp b/src/third_party/js-1.7/js.mdp
similarity index 100%
rename from third_party/js-1.7/js.mdp
rename to src/third_party/js-1.7/js.mdp
diff --git a/third_party/js-1.7/js.msg b/src/third_party/js-1.7/js.msg
similarity index 100%
rename from third_party/js-1.7/js.msg
rename to src/third_party/js-1.7/js.msg
diff --git a/third_party/js-1.7/js.pkg b/src/third_party/js-1.7/js.pkg
similarity index 100%
rename from third_party/js-1.7/js.pkg
rename to src/third_party/js-1.7/js.pkg
diff --git a/third_party/js-1.7/js3240.rc b/src/third_party/js-1.7/js3240.rc
similarity index 100%
rename from third_party/js-1.7/js3240.rc
rename to src/third_party/js-1.7/js3240.rc
diff --git a/third_party/js-1.7/jsOS240.def b/src/third_party/js-1.7/jsOS240.def
similarity index 100%
rename from third_party/js-1.7/jsOS240.def
rename to src/third_party/js-1.7/jsOS240.def
diff --git a/third_party/js-1.7/jsapi.c b/src/third_party/js-1.7/jsapi.c
similarity index 100%
rename from third_party/js-1.7/jsapi.c
rename to src/third_party/js-1.7/jsapi.c
diff --git a/third_party/js-1.7/jsapi.h b/src/third_party/js-1.7/jsapi.h
similarity index 100%
rename from third_party/js-1.7/jsapi.h
rename to src/third_party/js-1.7/jsapi.h
diff --git a/third_party/js-1.7/jsarena.c b/src/third_party/js-1.7/jsarena.c
similarity index 100%
rename from third_party/js-1.7/jsarena.c
rename to src/third_party/js-1.7/jsarena.c
diff --git a/third_party/js-1.7/jsarena.h b/src/third_party/js-1.7/jsarena.h
similarity index 100%
rename from third_party/js-1.7/jsarena.h
rename to src/third_party/js-1.7/jsarena.h
diff --git a/third_party/js-1.7/jsarray.c b/src/third_party/js-1.7/jsarray.c
similarity index 100%
rename from third_party/js-1.7/jsarray.c
rename to src/third_party/js-1.7/jsarray.c
diff --git a/third_party/js-1.7/jsarray.h b/src/third_party/js-1.7/jsarray.h
similarity index 100%
rename from third_party/js-1.7/jsarray.h
rename to src/third_party/js-1.7/jsarray.h
diff --git a/third_party/js-1.7/jsatom.c b/src/third_party/js-1.7/jsatom.c
similarity index 100%
rename from third_party/js-1.7/jsatom.c
rename to src/third_party/js-1.7/jsatom.c
diff --git a/third_party/js-1.7/jsatom.h b/src/third_party/js-1.7/jsatom.h
similarity index 100%
rename from third_party/js-1.7/jsatom.h
rename to src/third_party/js-1.7/jsatom.h
diff --git a/third_party/js-1.7/jsbit.h b/src/third_party/js-1.7/jsbit.h
similarity index 100%
rename from third_party/js-1.7/jsbit.h
rename to src/third_party/js-1.7/jsbit.h
diff --git a/third_party/js-1.7/jsbool.c b/src/third_party/js-1.7/jsbool.c
similarity index 100%
rename from third_party/js-1.7/jsbool.c
rename to src/third_party/js-1.7/jsbool.c
diff --git a/third_party/js-1.7/jsbool.h b/src/third_party/js-1.7/jsbool.h
similarity index 100%
rename from third_party/js-1.7/jsbool.h
rename to src/third_party/js-1.7/jsbool.h
diff --git a/third_party/js-1.7/jsclist.h b/src/third_party/js-1.7/jsclist.h
similarity index 100%
rename from third_party/js-1.7/jsclist.h
rename to src/third_party/js-1.7/jsclist.h
diff --git a/third_party/js-1.7/jscntxt.c b/src/third_party/js-1.7/jscntxt.c
similarity index 100%
rename from third_party/js-1.7/jscntxt.c
rename to src/third_party/js-1.7/jscntxt.c
diff --git a/third_party/js-1.7/jscntxt.h b/src/third_party/js-1.7/jscntxt.h
similarity index 100%
rename from third_party/js-1.7/jscntxt.h
rename to src/third_party/js-1.7/jscntxt.h
diff --git a/third_party/js-1.7/jscompat.h b/src/third_party/js-1.7/jscompat.h
similarity index 100%
rename from third_party/js-1.7/jscompat.h
rename to src/third_party/js-1.7/jscompat.h
diff --git a/third_party/js-1.7/jsconfig.h b/src/third_party/js-1.7/jsconfig.h
similarity index 100%
rename from third_party/js-1.7/jsconfig.h
rename to src/third_party/js-1.7/jsconfig.h
diff --git a/third_party/js-1.7/jsconfig.mk b/src/third_party/js-1.7/jsconfig.mk
similarity index 100%
rename from third_party/js-1.7/jsconfig.mk
rename to src/third_party/js-1.7/jsconfig.mk
diff --git a/third_party/js-1.7/jscpucfg.c b/src/third_party/js-1.7/jscpucfg.c
similarity index 100%
rename from third_party/js-1.7/jscpucfg.c
rename to src/third_party/js-1.7/jscpucfg.c
diff --git a/third_party/js-1.7/jscpucfg.h b/src/third_party/js-1.7/jscpucfg.h
similarity index 100%
rename from third_party/js-1.7/jscpucfg.h
rename to src/third_party/js-1.7/jscpucfg.h
diff --git a/third_party/js-1.7/jsdate.c b/src/third_party/js-1.7/jsdate.c
similarity index 100%
rename from third_party/js-1.7/jsdate.c
rename to src/third_party/js-1.7/jsdate.c
diff --git a/third_party/js-1.7/jsdate.h b/src/third_party/js-1.7/jsdate.h
similarity index 100%
rename from third_party/js-1.7/jsdate.h
rename to src/third_party/js-1.7/jsdate.h
diff --git a/third_party/js-1.7/jsdbgapi.c b/src/third_party/js-1.7/jsdbgapi.c
similarity index 100%
rename from third_party/js-1.7/jsdbgapi.c
rename to src/third_party/js-1.7/jsdbgapi.c
diff --git a/third_party/js-1.7/jsdbgapi.h b/src/third_party/js-1.7/jsdbgapi.h
similarity index 100%
rename from third_party/js-1.7/jsdbgapi.h
rename to src/third_party/js-1.7/jsdbgapi.h
diff --git a/third_party/js-1.7/jsdhash.c b/src/third_party/js-1.7/jsdhash.c
similarity index 100%
rename from third_party/js-1.7/jsdhash.c
rename to src/third_party/js-1.7/jsdhash.c
diff --git a/third_party/js-1.7/jsdhash.h b/src/third_party/js-1.7/jsdhash.h
similarity index 100%
rename from third_party/js-1.7/jsdhash.h
rename to src/third_party/js-1.7/jsdhash.h
diff --git a/third_party/js-1.7/jsdtoa.c b/src/third_party/js-1.7/jsdtoa.c
similarity index 100%
rename from third_party/js-1.7/jsdtoa.c
rename to src/third_party/js-1.7/jsdtoa.c
diff --git a/third_party/js-1.7/jsdtoa.h b/src/third_party/js-1.7/jsdtoa.h
similarity index 100%
rename from third_party/js-1.7/jsdtoa.h
rename to src/third_party/js-1.7/jsdtoa.h
diff --git a/third_party/js-1.7/jsemit.c b/src/third_party/js-1.7/jsemit.c
similarity index 100%
rename from third_party/js-1.7/jsemit.c
rename to src/third_party/js-1.7/jsemit.c
diff --git a/third_party/js-1.7/jsemit.h b/src/third_party/js-1.7/jsemit.h
similarity index 100%
rename from third_party/js-1.7/jsemit.h
rename to src/third_party/js-1.7/jsemit.h
diff --git a/third_party/js-1.7/jsexn.c b/src/third_party/js-1.7/jsexn.c
similarity index 100%
rename from third_party/js-1.7/jsexn.c
rename to src/third_party/js-1.7/jsexn.c
diff --git a/third_party/js-1.7/jsexn.h b/src/third_party/js-1.7/jsexn.h
similarity index 100%
rename from third_party/js-1.7/jsexn.h
rename to src/third_party/js-1.7/jsexn.h
diff --git a/third_party/js-1.7/jsfile.c b/src/third_party/js-1.7/jsfile.c
similarity index 100%
rename from third_party/js-1.7/jsfile.c
rename to src/third_party/js-1.7/jsfile.c
diff --git a/third_party/js-1.7/jsfile.h b/src/third_party/js-1.7/jsfile.h
similarity index 100%
rename from third_party/js-1.7/jsfile.h
rename to src/third_party/js-1.7/jsfile.h
diff --git a/third_party/js-1.7/jsfile.msg b/src/third_party/js-1.7/jsfile.msg
similarity index 100%
rename from third_party/js-1.7/jsfile.msg
rename to src/third_party/js-1.7/jsfile.msg
diff --git a/third_party/js-1.7/jsfun.c b/src/third_party/js-1.7/jsfun.c
similarity index 100%
rename from third_party/js-1.7/jsfun.c
rename to src/third_party/js-1.7/jsfun.c
diff --git a/third_party/js-1.7/jsfun.h b/src/third_party/js-1.7/jsfun.h
similarity index 100%
rename from third_party/js-1.7/jsfun.h
rename to src/third_party/js-1.7/jsfun.h
diff --git a/third_party/js-1.7/jsgc.c b/src/third_party/js-1.7/jsgc.c
similarity index 100%
rename from third_party/js-1.7/jsgc.c
rename to src/third_party/js-1.7/jsgc.c
diff --git a/third_party/js-1.7/jsgc.h b/src/third_party/js-1.7/jsgc.h
similarity index 100%
rename from third_party/js-1.7/jsgc.h
rename to src/third_party/js-1.7/jsgc.h
diff --git a/third_party/js-1.7/jshash.c b/src/third_party/js-1.7/jshash.c
similarity index 100%
rename from third_party/js-1.7/jshash.c
rename to src/third_party/js-1.7/jshash.c
diff --git a/third_party/js-1.7/jshash.h b/src/third_party/js-1.7/jshash.h
similarity index 100%
rename from third_party/js-1.7/jshash.h
rename to src/third_party/js-1.7/jshash.h
diff --git a/third_party/js-1.7/jsify.pl b/src/third_party/js-1.7/jsify.pl
similarity index 100%
rename from third_party/js-1.7/jsify.pl
rename to src/third_party/js-1.7/jsify.pl
diff --git a/third_party/js-1.7/jsinterp.c b/src/third_party/js-1.7/jsinterp.c
similarity index 100%
rename from third_party/js-1.7/jsinterp.c
rename to src/third_party/js-1.7/jsinterp.c
diff --git a/third_party/js-1.7/jsinterp.h b/src/third_party/js-1.7/jsinterp.h
similarity index 100%
rename from third_party/js-1.7/jsinterp.h
rename to src/third_party/js-1.7/jsinterp.h
diff --git a/third_party/js-1.7/jsiter.c b/src/third_party/js-1.7/jsiter.c
similarity index 100%
rename from third_party/js-1.7/jsiter.c
rename to src/third_party/js-1.7/jsiter.c
diff --git a/third_party/js-1.7/jsiter.h b/src/third_party/js-1.7/jsiter.h
similarity index 100%
rename from third_party/js-1.7/jsiter.h
rename to src/third_party/js-1.7/jsiter.h
diff --git a/third_party/js-1.7/jskeyword.tbl b/src/third_party/js-1.7/jskeyword.tbl
similarity index 100%
rename from third_party/js-1.7/jskeyword.tbl
rename to src/third_party/js-1.7/jskeyword.tbl
diff --git a/third_party/js-1.7/jskwgen.c b/src/third_party/js-1.7/jskwgen.c
similarity index 100%
rename from third_party/js-1.7/jskwgen.c
rename to src/third_party/js-1.7/jskwgen.c
diff --git a/third_party/js-1.7/jslibmath.h b/src/third_party/js-1.7/jslibmath.h
similarity index 100%
rename from third_party/js-1.7/jslibmath.h
rename to src/third_party/js-1.7/jslibmath.h
diff --git a/third_party/js-1.7/jslock.c b/src/third_party/js-1.7/jslock.c
similarity index 100%
rename from third_party/js-1.7/jslock.c
rename to src/third_party/js-1.7/jslock.c
diff --git a/third_party/js-1.7/jslock.h b/src/third_party/js-1.7/jslock.h
similarity index 100%
rename from third_party/js-1.7/jslock.h
rename to src/third_party/js-1.7/jslock.h
diff --git a/third_party/js-1.7/jslocko.asm b/src/third_party/js-1.7/jslocko.asm
similarity index 100%
rename from third_party/js-1.7/jslocko.asm
rename to src/third_party/js-1.7/jslocko.asm
diff --git a/third_party/js-1.7/jslog2.c b/src/third_party/js-1.7/jslog2.c
similarity index 100%
rename from third_party/js-1.7/jslog2.c
rename to src/third_party/js-1.7/jslog2.c
diff --git a/third_party/js-1.7/jslong.c b/src/third_party/js-1.7/jslong.c
similarity index 100%
rename from third_party/js-1.7/jslong.c
rename to src/third_party/js-1.7/jslong.c
diff --git a/third_party/js-1.7/jslong.h b/src/third_party/js-1.7/jslong.h
similarity index 100%
rename from third_party/js-1.7/jslong.h
rename to src/third_party/js-1.7/jslong.h
diff --git a/third_party/js-1.7/jsmath.c b/src/third_party/js-1.7/jsmath.c
similarity index 100%
rename from third_party/js-1.7/jsmath.c
rename to src/third_party/js-1.7/jsmath.c
diff --git a/third_party/js-1.7/jsmath.h b/src/third_party/js-1.7/jsmath.h
similarity index 100%
rename from third_party/js-1.7/jsmath.h
rename to src/third_party/js-1.7/jsmath.h
diff --git a/third_party/js-1.7/jsnum.c b/src/third_party/js-1.7/jsnum.c
similarity index 100%
rename from third_party/js-1.7/jsnum.c
rename to src/third_party/js-1.7/jsnum.c
diff --git a/third_party/js-1.7/jsnum.h b/src/third_party/js-1.7/jsnum.h
similarity index 100%
rename from third_party/js-1.7/jsnum.h
rename to src/third_party/js-1.7/jsnum.h
diff --git a/third_party/js-1.7/jsobj.c b/src/third_party/js-1.7/jsobj.c
similarity index 100%
rename from third_party/js-1.7/jsobj.c
rename to src/third_party/js-1.7/jsobj.c
diff --git a/third_party/js-1.7/jsobj.h b/src/third_party/js-1.7/jsobj.h
similarity index 100%
rename from third_party/js-1.7/jsobj.h
rename to src/third_party/js-1.7/jsobj.h
diff --git a/third_party/js-1.7/jsopcode.c b/src/third_party/js-1.7/jsopcode.c
similarity index 100%
rename from third_party/js-1.7/jsopcode.c
rename to src/third_party/js-1.7/jsopcode.c
diff --git a/third_party/js-1.7/jsopcode.h b/src/third_party/js-1.7/jsopcode.h
similarity index 100%
rename from third_party/js-1.7/jsopcode.h
rename to src/third_party/js-1.7/jsopcode.h
diff --git a/third_party/js-1.7/jsopcode.tbl b/src/third_party/js-1.7/jsopcode.tbl
similarity index 100%
rename from third_party/js-1.7/jsopcode.tbl
rename to src/third_party/js-1.7/jsopcode.tbl
diff --git a/third_party/js-1.7/jsosdep.h b/src/third_party/js-1.7/jsosdep.h
similarity index 100%
rename from third_party/js-1.7/jsosdep.h
rename to src/third_party/js-1.7/jsosdep.h
diff --git a/third_party/js-1.7/jsotypes.h b/src/third_party/js-1.7/jsotypes.h
similarity index 100%
rename from third_party/js-1.7/jsotypes.h
rename to src/third_party/js-1.7/jsotypes.h
diff --git a/third_party/js-1.7/jsparse.c b/src/third_party/js-1.7/jsparse.c
similarity index 100%
rename from third_party/js-1.7/jsparse.c
rename to src/third_party/js-1.7/jsparse.c
diff --git a/third_party/js-1.7/jsparse.h b/src/third_party/js-1.7/jsparse.h
similarity index 100%
rename from third_party/js-1.7/jsparse.h
rename to src/third_party/js-1.7/jsparse.h
diff --git a/third_party/js-1.7/jsprf.c b/src/third_party/js-1.7/jsprf.c
similarity index 100%
rename from third_party/js-1.7/jsprf.c
rename to src/third_party/js-1.7/jsprf.c
diff --git a/third_party/js-1.7/jsprf.h b/src/third_party/js-1.7/jsprf.h
similarity index 100%
rename from third_party/js-1.7/jsprf.h
rename to src/third_party/js-1.7/jsprf.h
diff --git a/third_party/js-1.7/jsproto.tbl b/src/third_party/js-1.7/jsproto.tbl
similarity index 100%
rename from third_party/js-1.7/jsproto.tbl
rename to src/third_party/js-1.7/jsproto.tbl
diff --git a/third_party/js-1.7/jsprvtd.h b/src/third_party/js-1.7/jsprvtd.h
similarity index 100%
rename from third_party/js-1.7/jsprvtd.h
rename to src/third_party/js-1.7/jsprvtd.h
diff --git a/third_party/js-1.7/jspubtd.h b/src/third_party/js-1.7/jspubtd.h
similarity index 100%
rename from third_party/js-1.7/jspubtd.h
rename to src/third_party/js-1.7/jspubtd.h
diff --git a/third_party/js-1.7/jsregexp.c b/src/third_party/js-1.7/jsregexp.c
similarity index 100%
rename from third_party/js-1.7/jsregexp.c
rename to src/third_party/js-1.7/jsregexp.c
diff --git a/third_party/js-1.7/jsregexp.h b/src/third_party/js-1.7/jsregexp.h
similarity index 100%
rename from third_party/js-1.7/jsregexp.h
rename to src/third_party/js-1.7/jsregexp.h
diff --git a/third_party/js-1.7/jsscan.c b/src/third_party/js-1.7/jsscan.c
similarity index 100%
rename from third_party/js-1.7/jsscan.c
rename to src/third_party/js-1.7/jsscan.c
diff --git a/third_party/js-1.7/jsscan.h b/src/third_party/js-1.7/jsscan.h
similarity index 100%
rename from third_party/js-1.7/jsscan.h
rename to src/third_party/js-1.7/jsscan.h
diff --git a/third_party/js-1.7/jsscope.c b/src/third_party/js-1.7/jsscope.c
similarity index 100%
rename from third_party/js-1.7/jsscope.c
rename to src/third_party/js-1.7/jsscope.c
diff --git a/third_party/js-1.7/jsscope.h b/src/third_party/js-1.7/jsscope.h
similarity index 100%
rename from third_party/js-1.7/jsscope.h
rename to src/third_party/js-1.7/jsscope.h
diff --git a/third_party/js-1.7/jsscript.c b/src/third_party/js-1.7/jsscript.c
similarity index 100%
rename from third_party/js-1.7/jsscript.c
rename to src/third_party/js-1.7/jsscript.c
diff --git a/third_party/js-1.7/jsscript.h b/src/third_party/js-1.7/jsscript.h
similarity index 100%
rename from third_party/js-1.7/jsscript.h
rename to src/third_party/js-1.7/jsscript.h
diff --git a/third_party/js-1.7/jsshell.msg b/src/third_party/js-1.7/jsshell.msg
similarity index 100%
rename from third_party/js-1.7/jsshell.msg
rename to src/third_party/js-1.7/jsshell.msg
diff --git a/third_party/js-1.7/jsstddef.h b/src/third_party/js-1.7/jsstddef.h
similarity index 100%
rename from third_party/js-1.7/jsstddef.h
rename to src/third_party/js-1.7/jsstddef.h
diff --git a/third_party/js-1.7/jsstr.c b/src/third_party/js-1.7/jsstr.c
similarity index 100%
rename from third_party/js-1.7/jsstr.c
rename to src/third_party/js-1.7/jsstr.c
diff --git a/third_party/js-1.7/jsstr.h b/src/third_party/js-1.7/jsstr.h
similarity index 100%
rename from third_party/js-1.7/jsstr.h
rename to src/third_party/js-1.7/jsstr.h
diff --git a/third_party/js-1.7/jstypes.h b/src/third_party/js-1.7/jstypes.h
similarity index 100%
rename from third_party/js-1.7/jstypes.h
rename to src/third_party/js-1.7/jstypes.h
diff --git a/third_party/js-1.7/jsutil.c b/src/third_party/js-1.7/jsutil.c
similarity index 100%
rename from third_party/js-1.7/jsutil.c
rename to src/third_party/js-1.7/jsutil.c
diff --git a/third_party/js-1.7/jsutil.h b/src/third_party/js-1.7/jsutil.h
similarity index 100%
rename from third_party/js-1.7/jsutil.h
rename to src/third_party/js-1.7/jsutil.h
diff --git a/third_party/js-1.7/jsxdrapi.c b/src/third_party/js-1.7/jsxdrapi.c
similarity index 100%
rename from third_party/js-1.7/jsxdrapi.c
rename to src/third_party/js-1.7/jsxdrapi.c
diff --git a/third_party/js-1.7/jsxdrapi.h b/src/third_party/js-1.7/jsxdrapi.h
similarity index 100%
rename from third_party/js-1.7/jsxdrapi.h
rename to src/third_party/js-1.7/jsxdrapi.h
diff --git a/third_party/js-1.7/jsxml.c b/src/third_party/js-1.7/jsxml.c
similarity index 100%
rename from third_party/js-1.7/jsxml.c
rename to src/third_party/js-1.7/jsxml.c
diff --git a/third_party/js-1.7/jsxml.h b/src/third_party/js-1.7/jsxml.h
similarity index 100%
rename from third_party/js-1.7/jsxml.h
rename to src/third_party/js-1.7/jsxml.h
diff --git a/third_party/js-1.7/lock_SunOS.s b/src/third_party/js-1.7/lock_SunOS.s
similarity index 100%
rename from third_party/js-1.7/lock_SunOS.s
rename to src/third_party/js-1.7/lock_SunOS.s
diff --git a/third_party/js-1.7/perfect.js b/src/third_party/js-1.7/perfect.js
similarity index 100%
rename from third_party/js-1.7/perfect.js
rename to src/third_party/js-1.7/perfect.js
diff --git a/third_party/js-1.7/plify_jsdhash.sed b/src/third_party/js-1.7/plify_jsdhash.sed
similarity index 100%
rename from third_party/js-1.7/plify_jsdhash.sed
rename to src/third_party/js-1.7/plify_jsdhash.sed
diff --git a/third_party/js-1.7/prmjtime.c b/src/third_party/js-1.7/prmjtime.c
similarity index 100%
rename from third_party/js-1.7/prmjtime.c
rename to src/third_party/js-1.7/prmjtime.c
diff --git a/third_party/js-1.7/prmjtime.h b/src/third_party/js-1.7/prmjtime.h
similarity index 100%
rename from third_party/js-1.7/prmjtime.h
rename to src/third_party/js-1.7/prmjtime.h
diff --git a/third_party/js-1.7/resource.h b/src/third_party/js-1.7/resource.h
similarity index 100%
rename from third_party/js-1.7/resource.h
rename to src/third_party/js-1.7/resource.h
diff --git a/third_party/js-1.7/rules.mk b/src/third_party/js-1.7/rules.mk
similarity index 100%
rename from third_party/js-1.7/rules.mk
rename to src/third_party/js-1.7/rules.mk
diff --git a/third_party/js-1.7/win32.order b/src/third_party/js-1.7/win32.order
similarity index 100%
rename from third_party/js-1.7/win32.order
rename to src/third_party/js-1.7/win32.order
diff --git a/third_party/linenoise/Makefile b/src/third_party/linenoise/Makefile
similarity index 100%
rename from third_party/linenoise/Makefile
rename to src/third_party/linenoise/Makefile
diff --git a/third_party/linenoise/README.markdown b/src/third_party/linenoise/README.markdown
similarity index 100%
rename from third_party/linenoise/README.markdown
rename to src/third_party/linenoise/README.markdown
diff --git a/third_party/linenoise/example.c b/src/third_party/linenoise/example.c
similarity index 100%
rename from third_party/linenoise/example.c
rename to src/third_party/linenoise/example.c
diff --git a/third_party/linenoise/history.txt b/src/third_party/linenoise/history.txt
similarity index 100%
rename from third_party/linenoise/history.txt
rename to src/third_party/linenoise/history.txt
diff --git a/third_party/linenoise/linenoise.cpp b/src/third_party/linenoise/linenoise.cpp
similarity index 100%
rename from third_party/linenoise/linenoise.cpp
rename to src/third_party/linenoise/linenoise.cpp
diff --git a/third_party/linenoise/linenoise.h b/src/third_party/linenoise/linenoise.h
similarity index 100%
rename from third_party/linenoise/linenoise.h
rename to src/third_party/linenoise/linenoise.h
diff --git a/third_party/linenoise/linenoise_win32.cpp b/src/third_party/linenoise/linenoise_win32.cpp
similarity index 100%
rename from third_party/linenoise/linenoise_win32.cpp
rename to src/third_party/linenoise/linenoise_win32.cpp
diff --git a/third_party/pcre-7.4/config-cmake.h.in b/src/third_party/pcre-7.4/config-cmake.h.in
similarity index 100%
rename from third_party/pcre-7.4/config-cmake.h.in
rename to src/third_party/pcre-7.4/config-cmake.h.in
diff --git a/third_party/pcre-7.4/config.h b/src/third_party/pcre-7.4/config.h
similarity index 100%
rename from third_party/pcre-7.4/config.h
rename to src/third_party/pcre-7.4/config.h
diff --git a/third_party/pcre-7.4/config.h.generic b/src/third_party/pcre-7.4/config.h.generic
similarity index 100%
rename from third_party/pcre-7.4/config.h.generic
rename to src/third_party/pcre-7.4/config.h.generic
diff --git a/third_party/pcre-7.4/config.h.in b/src/third_party/pcre-7.4/config.h.in
similarity index 100%
rename from third_party/pcre-7.4/config.h.in
rename to src/third_party/pcre-7.4/config.h.in
diff --git a/third_party/pcre-7.4/dftables.c b/src/third_party/pcre-7.4/dftables.c
similarity index 100%
rename from third_party/pcre-7.4/dftables.c
rename to src/third_party/pcre-7.4/dftables.c
diff --git a/third_party/pcre-7.4/pcre.h b/src/third_party/pcre-7.4/pcre.h
similarity index 100%
rename from third_party/pcre-7.4/pcre.h
rename to src/third_party/pcre-7.4/pcre.h
diff --git a/third_party/pcre-7.4/pcre.h.generic b/src/third_party/pcre-7.4/pcre.h.generic
similarity index 100%
rename from third_party/pcre-7.4/pcre.h.generic
rename to src/third_party/pcre-7.4/pcre.h.generic
diff --git a/third_party/pcre-7.4/pcre.h.in b/src/third_party/pcre-7.4/pcre.h.in
similarity index 100%
rename from third_party/pcre-7.4/pcre.h.in
rename to src/third_party/pcre-7.4/pcre.h.in
diff --git a/third_party/pcre-7.4/pcre_chartables.c b/src/third_party/pcre-7.4/pcre_chartables.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_chartables.c
rename to src/third_party/pcre-7.4/pcre_chartables.c
diff --git a/third_party/pcre-7.4/pcre_chartables.c.dist b/src/third_party/pcre-7.4/pcre_chartables.c.dist
similarity index 100%
rename from third_party/pcre-7.4/pcre_chartables.c.dist
rename to src/third_party/pcre-7.4/pcre_chartables.c.dist
diff --git a/third_party/pcre-7.4/pcre_compile.c b/src/third_party/pcre-7.4/pcre_compile.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_compile.c
rename to src/third_party/pcre-7.4/pcre_compile.c
diff --git a/third_party/pcre-7.4/pcre_config.c b/src/third_party/pcre-7.4/pcre_config.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_config.c
rename to src/third_party/pcre-7.4/pcre_config.c
diff --git a/third_party/pcre-7.4/pcre_dfa_exec.c b/src/third_party/pcre-7.4/pcre_dfa_exec.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_dfa_exec.c
rename to src/third_party/pcre-7.4/pcre_dfa_exec.c
diff --git a/third_party/pcre-7.4/pcre_exec.c b/src/third_party/pcre-7.4/pcre_exec.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_exec.c
rename to src/third_party/pcre-7.4/pcre_exec.c
diff --git a/third_party/pcre-7.4/pcre_fullinfo.c b/src/third_party/pcre-7.4/pcre_fullinfo.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_fullinfo.c
rename to src/third_party/pcre-7.4/pcre_fullinfo.c
diff --git a/third_party/pcre-7.4/pcre_get.c b/src/third_party/pcre-7.4/pcre_get.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_get.c
rename to src/third_party/pcre-7.4/pcre_get.c
diff --git a/third_party/pcre-7.4/pcre_globals.c b/src/third_party/pcre-7.4/pcre_globals.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_globals.c
rename to src/third_party/pcre-7.4/pcre_globals.c
diff --git a/third_party/pcre-7.4/pcre_info.c b/src/third_party/pcre-7.4/pcre_info.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_info.c
rename to src/third_party/pcre-7.4/pcre_info.c
diff --git a/third_party/pcre-7.4/pcre_internal.h b/src/third_party/pcre-7.4/pcre_internal.h
similarity index 100%
rename from third_party/pcre-7.4/pcre_internal.h
rename to src/third_party/pcre-7.4/pcre_internal.h
diff --git a/third_party/pcre-7.4/pcre_maketables.c b/src/third_party/pcre-7.4/pcre_maketables.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_maketables.c
rename to src/third_party/pcre-7.4/pcre_maketables.c
diff --git a/third_party/pcre-7.4/pcre_newline.c b/src/third_party/pcre-7.4/pcre_newline.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_newline.c
rename to src/third_party/pcre-7.4/pcre_newline.c
diff --git a/third_party/pcre-7.4/pcre_ord2utf8.c b/src/third_party/pcre-7.4/pcre_ord2utf8.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_ord2utf8.c
rename to src/third_party/pcre-7.4/pcre_ord2utf8.c
diff --git a/third_party/pcre-7.4/pcre_refcount.c b/src/third_party/pcre-7.4/pcre_refcount.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_refcount.c
rename to src/third_party/pcre-7.4/pcre_refcount.c
diff --git a/third_party/pcre-7.4/pcre_scanner.cc b/src/third_party/pcre-7.4/pcre_scanner.cc
similarity index 100%
rename from third_party/pcre-7.4/pcre_scanner.cc
rename to src/third_party/pcre-7.4/pcre_scanner.cc
diff --git a/third_party/pcre-7.4/pcre_scanner.h b/src/third_party/pcre-7.4/pcre_scanner.h
similarity index 100%
rename from third_party/pcre-7.4/pcre_scanner.h
rename to src/third_party/pcre-7.4/pcre_scanner.h
diff --git a/third_party/pcre-7.4/pcre_scanner_unittest.cc b/src/third_party/pcre-7.4/pcre_scanner_unittest.cc
similarity index 100%
rename from third_party/pcre-7.4/pcre_scanner_unittest.cc
rename to src/third_party/pcre-7.4/pcre_scanner_unittest.cc
diff --git a/third_party/pcre-7.4/pcre_stringpiece.cc b/src/third_party/pcre-7.4/pcre_stringpiece.cc
similarity index 100%
rename from third_party/pcre-7.4/pcre_stringpiece.cc
rename to src/third_party/pcre-7.4/pcre_stringpiece.cc
diff --git a/third_party/pcre-7.4/pcre_stringpiece.h b/src/third_party/pcre-7.4/pcre_stringpiece.h
similarity index 100%
rename from third_party/pcre-7.4/pcre_stringpiece.h
rename to src/third_party/pcre-7.4/pcre_stringpiece.h
diff --git a/third_party/pcre-7.4/pcre_stringpiece.h.in b/src/third_party/pcre-7.4/pcre_stringpiece.h.in
similarity index 100%
rename from third_party/pcre-7.4/pcre_stringpiece.h.in
rename to src/third_party/pcre-7.4/pcre_stringpiece.h.in
diff --git a/third_party/pcre-7.4/pcre_stringpiece_unittest.cc b/src/third_party/pcre-7.4/pcre_stringpiece_unittest.cc
similarity index 100%
rename from third_party/pcre-7.4/pcre_stringpiece_unittest.cc
rename to src/third_party/pcre-7.4/pcre_stringpiece_unittest.cc
diff --git a/third_party/pcre-7.4/pcre_study.c b/src/third_party/pcre-7.4/pcre_study.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_study.c
rename to src/third_party/pcre-7.4/pcre_study.c
diff --git a/third_party/pcre-7.4/pcre_tables.c b/src/third_party/pcre-7.4/pcre_tables.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_tables.c
rename to src/third_party/pcre-7.4/pcre_tables.c
diff --git a/third_party/pcre-7.4/pcre_try_flipped.c b/src/third_party/pcre-7.4/pcre_try_flipped.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_try_flipped.c
rename to src/third_party/pcre-7.4/pcre_try_flipped.c
diff --git a/third_party/pcre-7.4/pcre_ucp_searchfuncs.c b/src/third_party/pcre-7.4/pcre_ucp_searchfuncs.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_ucp_searchfuncs.c
rename to src/third_party/pcre-7.4/pcre_ucp_searchfuncs.c
diff --git a/third_party/pcre-7.4/pcre_valid_utf8.c b/src/third_party/pcre-7.4/pcre_valid_utf8.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_valid_utf8.c
rename to src/third_party/pcre-7.4/pcre_valid_utf8.c
diff --git a/third_party/pcre-7.4/pcre_version.c b/src/third_party/pcre-7.4/pcre_version.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_version.c
rename to src/third_party/pcre-7.4/pcre_version.c
diff --git a/third_party/pcre-7.4/pcre_xclass.c b/src/third_party/pcre-7.4/pcre_xclass.c
similarity index 100%
rename from third_party/pcre-7.4/pcre_xclass.c
rename to src/third_party/pcre-7.4/pcre_xclass.c
diff --git a/third_party/pcre-7.4/pcrecpp.cc b/src/third_party/pcre-7.4/pcrecpp.cc
similarity index 100%
rename from third_party/pcre-7.4/pcrecpp.cc
rename to src/third_party/pcre-7.4/pcrecpp.cc
diff --git a/third_party/pcre-7.4/pcrecpp.h b/src/third_party/pcre-7.4/pcrecpp.h
similarity index 100%
rename from third_party/pcre-7.4/pcrecpp.h
rename to src/third_party/pcre-7.4/pcrecpp.h
diff --git a/third_party/pcre-7.4/pcrecpp_internal.h b/src/third_party/pcre-7.4/pcrecpp_internal.h
similarity index 100%
rename from third_party/pcre-7.4/pcrecpp_internal.h
rename to src/third_party/pcre-7.4/pcrecpp_internal.h
diff --git a/third_party/pcre-7.4/pcrecpp_unittest.cc b/src/third_party/pcre-7.4/pcrecpp_unittest.cc
similarity index 100%
rename from third_party/pcre-7.4/pcrecpp_unittest.cc
rename to src/third_party/pcre-7.4/pcrecpp_unittest.cc
diff --git a/third_party/pcre-7.4/pcrecpparg.h b/src/third_party/pcre-7.4/pcrecpparg.h
similarity index 100%
rename from third_party/pcre-7.4/pcrecpparg.h
rename to src/third_party/pcre-7.4/pcrecpparg.h
diff --git a/third_party/pcre-7.4/pcrecpparg.h.in b/src/third_party/pcre-7.4/pcrecpparg.h.in
similarity index 100%
rename from third_party/pcre-7.4/pcrecpparg.h.in
rename to src/third_party/pcre-7.4/pcrecpparg.h.in
diff --git a/third_party/pcre-7.4/pcredemo.c b/src/third_party/pcre-7.4/pcredemo.c
similarity index 100%
rename from third_party/pcre-7.4/pcredemo.c
rename to src/third_party/pcre-7.4/pcredemo.c
diff --git a/third_party/pcre-7.4/pcregrep.c b/src/third_party/pcre-7.4/pcregrep.c
similarity index 100%
rename from third_party/pcre-7.4/pcregrep.c
rename to src/third_party/pcre-7.4/pcregrep.c
diff --git a/third_party/pcre-7.4/pcreposix.c b/src/third_party/pcre-7.4/pcreposix.c
similarity index 100%
rename from third_party/pcre-7.4/pcreposix.c
rename to src/third_party/pcre-7.4/pcreposix.c
diff --git a/third_party/pcre-7.4/pcreposix.h b/src/third_party/pcre-7.4/pcreposix.h
similarity index 100%
rename from third_party/pcre-7.4/pcreposix.h
rename to src/third_party/pcre-7.4/pcreposix.h
diff --git a/third_party/pcre-7.4/pcretest.c b/src/third_party/pcre-7.4/pcretest.c
similarity index 100%
rename from third_party/pcre-7.4/pcretest.c
rename to src/third_party/pcre-7.4/pcretest.c
diff --git a/third_party/pcre-7.4/ucp.h b/src/third_party/pcre-7.4/ucp.h
similarity index 100%
rename from third_party/pcre-7.4/ucp.h
rename to src/third_party/pcre-7.4/ucp.h
diff --git a/third_party/pcre-7.4/ucpinternal.h b/src/third_party/pcre-7.4/ucpinternal.h
similarity index 100%
rename from third_party/pcre-7.4/ucpinternal.h
rename to src/third_party/pcre-7.4/ucpinternal.h
diff --git a/third_party/pcre-7.4/ucptable.h b/src/third_party/pcre-7.4/ucptable.h
similarity index 100%
rename from third_party/pcre-7.4/ucptable.h
rename to src/third_party/pcre-7.4/ucptable.h
diff --git a/third_party/pcre.py b/src/third_party/pcre.py
similarity index 91%
rename from third_party/pcre.py
rename to src/third_party/pcre.py
index fdc761af8d1..f33a71fe726 100644
--- a/third_party/pcre.py
+++ b/src/third_party/pcre.py
@@ -1,9 +1,9 @@
 
 import os
 
-def getFiles():
+root = "src/third_party/pcre-7.4"
 
-    root = "third_party/pcre-7.4"
+def getFiles():
 
     def pcreFilter(x):
         if x.endswith( "dftables.c" ):
@@ -25,7 +25,7 @@ def getFiles():
 def configure( env , fileLists , options ):
     #fileLists = { "serverOnlyFiles" : [] }
 
-    env.Prepend( CPPPATH=["./third_party/pcre-7.4/"] )
+    env.Prepend( CPPPATH=["./" + root + "/"] )
 
     myenv = env.Clone()
     myenv.Append( CPPDEFINES=["HAVE_CONFIG_H"] )
diff --git a/third_party/sm.py b/src/third_party/sm.py
similarity index 99%
rename from third_party/sm.py
rename to src/third_party/sm.py
index 9927be88b78..19a4dcbdae0 100644
--- a/third_party/sm.py
+++ b/src/third_party/sm.py
@@ -37,7 +37,7 @@ basicFiles = [ "jsapi.c" ,
                "jsxml.c" ,
                "prmjtime.c" ]
 
-root = "third_party/js-1.7"
+root = "src/third_party/js-1.7"
 
 def r(x):
     return "%s/%s" % ( root , x )
diff --git a/third_party/snappy.py b/src/third_party/snappy.py
similarity index 81%
rename from third_party/snappy.py
rename to src/third_party/snappy.py
index e53ee632bbd..7949bbd555f 100644
--- a/third_party/snappy.py
+++ b/src/third_party/snappy.py
@@ -6,7 +6,7 @@ def configure( env , fileLists , options ):
     if not options["windows"]:
         myenv.Append(CPPFLAGS=" -Wno-sign-compare -Wno-unused-function ") #snappy doesn't compile cleanly
     
-    files = ["third_party/snappy/snappy.cc", "third_party/snappy/snappy-sinksource.cc"]
+    files = ["src/third_party/snappy/snappy.cc", "src/third_party/snappy/snappy-sinksource.cc"]
 
     fileLists["serverOnlyFiles"] += [ myenv.Object(f) for f in files ]
 
diff --git a/third_party/snappy/COPYING b/src/third_party/snappy/COPYING
similarity index 100%
rename from third_party/snappy/COPYING
rename to src/third_party/snappy/COPYING
diff --git a/third_party/snappy/README b/src/third_party/snappy/README
similarity index 100%
rename from third_party/snappy/README
rename to src/third_party/snappy/README
diff --git a/third_party/snappy/config.h b/src/third_party/snappy/config.h
similarity index 100%
rename from third_party/snappy/config.h
rename to src/third_party/snappy/config.h
diff --git a/third_party/snappy/snappy-internal.h b/src/third_party/snappy/snappy-internal.h
similarity index 100%
rename from third_party/snappy/snappy-internal.h
rename to src/third_party/snappy/snappy-internal.h
diff --git a/third_party/snappy/snappy-sinksource.cc b/src/third_party/snappy/snappy-sinksource.cc
similarity index 100%
rename from third_party/snappy/snappy-sinksource.cc
rename to src/third_party/snappy/snappy-sinksource.cc
diff --git a/third_party/snappy/snappy-sinksource.h b/src/third_party/snappy/snappy-sinksource.h
similarity index 100%
rename from third_party/snappy/snappy-sinksource.h
rename to src/third_party/snappy/snappy-sinksource.h
diff --git a/third_party/snappy/snappy-stubs-internal.cc b/src/third_party/snappy/snappy-stubs-internal.cc
similarity index 100%
rename from third_party/snappy/snappy-stubs-internal.cc
rename to src/third_party/snappy/snappy-stubs-internal.cc
diff --git a/third_party/snappy/snappy-stubs-internal.h b/src/third_party/snappy/snappy-stubs-internal.h
similarity index 100%
rename from third_party/snappy/snappy-stubs-internal.h
rename to src/third_party/snappy/snappy-stubs-internal.h
diff --git a/third_party/snappy/snappy-stubs-public.h b/src/third_party/snappy/snappy-stubs-public.h
similarity index 100%
rename from third_party/snappy/snappy-stubs-public.h
rename to src/third_party/snappy/snappy-stubs-public.h
diff --git a/third_party/snappy/snappy.cc b/src/third_party/snappy/snappy.cc
similarity index 100%
rename from third_party/snappy/snappy.cc
rename to src/third_party/snappy/snappy.cc
diff --git a/third_party/snappy/snappy.h b/src/third_party/snappy/snappy.h
similarity index 100%
rename from third_party/snappy/snappy.h
rename to src/third_party/snappy/snappy.h