13 files changed, 38 insertions, 38 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 5a9a6d95c34..2ed4928aec3 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -104,7 +104,7 @@ env.StaticLibrary("coredb", [
         "db/commands.cpp",
         "db/commands/hashcmd.cpp",
         "db/commands/isself.cpp",
-        "db/commands/pipeline.cpp",
+        "db/pipeline/pipeline.cpp",
         "db/dbcommands_generic.cpp",
         "db/dbwebserver.cpp",
         "db/matcher.cpp",
@@ -122,7 +122,7 @@ env.StaticLibrary("coredb", [
         "db/pipeline/document.cpp",
         "db/pipeline/document_source.cpp",
         "db/pipeline/document_source_bson_array.cpp",
-        "db/pipeline/document_source_command_futures.cpp",
+        "db/pipeline/document_source_command_shards.cpp",
         "db/pipeline/document_source_filter.cpp",
         "db/pipeline/document_source_filter_base.cpp",
         "db/pipeline/document_source_group.cpp",
@@ -295,8 +295,8 @@ serverOnlyFiles = [ "db/curop.cpp",
                     "db/commands/group.cpp",
                     "db/commands/mr.cpp",
                     "db/commands/pipeline_command.cpp",
-                    "db/commands/pipeline_d.cpp",
-                    "db/commands/document_source_cursor.cpp",
+                    "db/pipeline/pipeline_d.cpp",
+                    "db/pipeline/document_source_cursor.cpp",
                     "db/driverHelpers.cpp" ]
 
 env.Library( "dbcmdline", "db/cmdline.cpp" )
diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
index 02df436bdcb..6527fc4ca07 100755
--- a/src/mongo/db/commands/pipeline_command.cpp
+++ b/src/mongo/db/commands/pipeline_command.cpp
@@ -16,8 +16,8 @@
 
 #include "pch.h"
 
-#include "db/commands/pipeline.h"
-#include "db/commands/pipeline_d.h"
+#include "db/pipeline/pipeline.h"
+#include "db/pipeline/pipeline_d.h"
 #include "db/interrupt_status_mongod.h"
 #include "db/pipeline/accumulator.h"
 #include "db/pipeline/document.h"
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
index 390897dbe0b..277f770bc56 100755
--- a/src/mongo/db/mongod.vcxproj
+++ b/src/mongo/db/mongod.vcxproj
@@ -1098,7 +1098,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="btreebuilder.cpp" />
     <ClCompile Include="cap.cpp" />
     <ClCompile Include="commands\distinct.cpp" />
-    <ClCompile Include="commands\document_source_cursor.cpp" />
+    <ClCompile Include="pipeline\document_source_cursor.cpp" />
     <ClCompile Include="commands\find_and_modify.cpp" />
     <ClCompile Include="commands\fsync.cpp" />
     <ClCompile Include="commands\group.cpp" />
@@ -1106,8 +1106,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="commands\isself.cpp" />
     <ClCompile Include="commands\mr.cpp" />
     <ClCompile Include="commands\pipeline_command.cpp" />
-    <ClCompile Include="commands\pipeline.cpp" />
-    <ClCompile Include="commands\pipeline_d.cpp" />
+    <ClCompile Include="pipeline\pipeline.cpp" />
+    <ClCompile Include="pipeline\pipeline_d.cpp" />
     <ClCompile Include="commands\touch.cpp" />
     <ClCompile Include="compact.cpp" />
     <ClCompile Include="connection_factory.cpp" />
@@ -1156,7 +1156,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="pipeline\document.cpp" />
     <ClCompile Include="pipeline\document_source.cpp" />
     <ClCompile Include="pipeline\document_source_bson_array.cpp" />
-    <ClCompile Include="pipeline\document_source_command_futures.cpp" />
+    <ClCompile Include="pipeline\document_source_command_shards.cpp" />
     <ClCompile Include="pipeline\document_source_filter.cpp" />
     <ClCompile Include="pipeline\document_source_filter_base.cpp" />
     <ClCompile Include="pipeline\document_source_group.cpp" />
@@ -1405,8 +1405,8 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\util\text.h" />
     <ClInclude Include="..\util\time_support.h" />
     <ClInclude Include="..\util\trace.h" />
-    <ClInclude Include="commands\pipeline.h" />
-    <ClInclude Include="commands\pipeline_d.h" />
+    <ClInclude Include="pipeline\pipeline.h" />
+    <ClInclude Include="pipeline\pipeline_d.h" />
     <ClInclude Include="databaseholder.h" />
     <ClInclude Include="durop.h" />
     <ClInclude Include="dur_commitjob.h" />
@@ -1535,4 +1535,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
index abf0ece9e1d..8f45869f89c 100755
--- a/src/mongo/db/mongod.vcxproj.filters
+++ b/src/mongo/db/mongod.vcxproj.filters
@@ -163,8 +163,8 @@
     <ClCompile Include="commands\distinct.cpp">
       <Filter>db\commands</Filter>
     </ClCompile>
-    <ClCompile Include="commands\document_source_cursor.cpp">
-      <Filter>db\commands</Filter>
+    <ClCompile Include="pipeline\document_source_cursor.cpp">
+      <Filter>db\pipeline</Filter>
     </ClCompile>
     <ClCompile Include="geo\2d.cpp">
       <Filter>db\geo</Filter>
@@ -211,7 +211,7 @@
     <ClCompile Include="pipeline\document_source_bson_array.cpp">
       <Filter>db\pipeline\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pipeline\document_source_command_futures.cpp">
+    <ClCompile Include="pipeline\document_source_command_shards.cpp">
       <Filter>db\pipeline\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="pipeline\document_source_filter.cpp">
@@ -395,14 +395,14 @@
       <Filter>util\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\pch.cpp" />
-    <ClCompile Include="commands\pipeline.cpp">
-      <Filter>db\commands</Filter>
+    <ClCompile Include="pipeline\pipeline.cpp">
+      <Filter>db\pipeline</Filter>
     </ClCompile>
     <ClCompile Include="commands\pipeline_command.cpp">
       <Filter>db\commands</Filter>
     </ClCompile>
-    <ClCompile Include="commands\pipeline_d.cpp">
-      <Filter>db\commands</Filter>
+    <ClCompile Include="pipeline\pipeline_d.cpp">
+      <Filter>db\pipeline</Filter>
     </ClCompile>
     <ClCompile Include="..\util\processinfo.cpp">
       <Filter>util\Source Files</Filter>
@@ -1146,11 +1146,11 @@
     <ClInclude Include="..\util\optime.h">
       <Filter>util\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="commands\pipeline.h">
-      <Filter>db\commands</Filter>
+    <ClInclude Include="pipeline\pipeline.h">
+      <Filter>db\pipeline</Filter>
     </ClInclude>
-    <ClInclude Include="commands\pipeline_d.h">
-      <Filter>db\commands</Filter>
+    <ClInclude Include="pipeline\pipeline_d.h">
+      <Filter>db\pipeline</Filter>
     </ClInclude>
     <ClInclude Include="..\util\processinfo.h">
       <Filter>util\Header Files</Filter>
@@ -1818,4 +1818,4 @@
       <Filter>db\Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/db/pipeline/document_source_command_futures.cpp b/src/mongo/db/pipeline/document_source_command_shards.cpp
index a0d5423b449..a0d5423b449 100644
--- a/src/mongo/db/pipeline/document_source_command_futures.cpp
+++ b/src/mongo/db/pipeline/document_source_command_shards.cpp
diff --git a/src/mongo/db/commands/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp
index c99504ad446..c99504ad446 100755
--- a/src/mongo/db/commands/document_source_cursor.cpp
+++ b/src/mongo/db/pipeline/document_source_cursor.cpp
diff --git a/src/mongo/db/commands/pipeline.cpp b/src/mongo/db/pipeline/pipeline.cpp
index b03624d2a08..0bd4096fe78 100644
--- a/src/mongo/db/commands/pipeline.cpp
+++ b/src/mongo/db/pipeline/pipeline.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "pch.h"
-#include "db/commands/pipeline.h"
+#include "db/pipeline/pipeline.h"
 
 #include "mongo/client/authentication_table.h"
 #include "db/jsobj.h"
diff --git a/src/mongo/db/commands/pipeline.h b/src/mongo/db/pipeline/pipeline.h
index f3d324333b5..f3d324333b5 100755
--- a/src/mongo/db/commands/pipeline.h
+++ b/src/mongo/db/pipeline/pipeline.h
diff --git a/src/mongo/db/commands/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp
index 7dc6fc1a759..ed075f727fa 100755
--- a/src/mongo/db/commands/pipeline_d.cpp
+++ b/src/mongo/db/pipeline/pipeline_d.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "pch.h"
-#include "db/commands/pipeline.h"
-#include "db/commands/pipeline_d.h"
+#include "db/pipeline/pipeline.h"
+#include "db/pipeline/pipeline_d.h"
 
 #include "db/cursor.h"
 #include "db/queryutil.h"
diff --git a/src/mongo/db/commands/pipeline_d.h b/src/mongo/db/pipeline/pipeline_d.h
index a514fe22fbc..a514fe22fbc 100755
--- a/src/mongo/db/commands/pipeline_d.h
+++ b/src/mongo/db/pipeline/pipeline_d.h
diff --git a/src/mongo/s/commands_public.cpp b/src/mongo/s/commands_public.cpp
index 4c9ba344694..41e0d1a5133 100644
--- a/src/mongo/s/commands_public.cpp
+++ b/src/mongo/s/commands_public.cpp
@@ -22,7 +22,7 @@
 #include "../client/connpool.h"
 #include "../client/parallel.h"
 #include "../db/commands.h"
-#include "../db/commands/pipeline.h"
+#include "../db/pipeline/pipeline.h"
 #include "../db/pipeline/document_source.h"
 #include "../db/pipeline/expression_context.h"
 #include "../db/queryutil.h"
diff --git a/src/mongo/s/mongos.vcxproj b/src/mongo/s/mongos.vcxproj
index 91902cbb0ad..d11904b11d2 100644
--- a/src/mongo/s/mongos.vcxproj
+++ b/src/mongo/s/mongos.vcxproj
@@ -976,7 +976,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\client\dbclientcursor.cpp" />
     <ClCompile Include="..\client\dbclient_rs.cpp" />
     <ClCompile Include="..\client\distlock.cpp" />
-    <ClCompile Include="..\db\commands\pipeline.cpp" />
+    <ClCompile Include="..\db\pipeline\pipeline.cpp" />
     <ClCompile Include="..\db\common.cpp" />
     <ClCompile Include="..\db\dbmessage.cpp" />
     <ClCompile Include="..\db\dbcommands_generic.cpp" />
@@ -994,7 +994,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClCompile Include="..\db\pipeline\document.cpp" />
     <ClCompile Include="..\db\pipeline\document_source.cpp" />
     <ClCompile Include="..\db\pipeline\document_source_bson_array.cpp" />
-    <ClCompile Include="..\db\pipeline\document_source_command_futures.cpp" />
+    <ClCompile Include="..\db\pipeline\document_source_command_shards.cpp" />
     <ClCompile Include="..\db\pipeline\document_source_filter.cpp" />
     <ClCompile Include="..\db\pipeline\document_source_filter_base.cpp" />
     <ClCompile Include="..\db\pipeline\document_source_group.cpp" />
@@ -1187,7 +1187,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\..\third_party\js-1.7\resource.h" />
     <ClInclude Include="..\client\authentication_table.h" />
     <ClInclude Include="..\client\authlevel.h" />
-    <ClInclude Include="..\db\commands\pipeline.h" />
+    <ClInclude Include="..\db\pipeline\pipeline.h" />
     <ClInclude Include="..\db\interrupt_status.h" />
     <ClInclude Include="..\db\pipeline\accumulator.h" />
     <ClInclude Include="..\db\pipeline\builder.h" />
@@ -1265,4 +1265,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/s/mongos.vcxproj.filters b/src/mongo/s/mongos.vcxproj.filters
index 6a6a2ae2838..fa49ec3b77e 100755
--- a/src/mongo/s/mongos.vcxproj.filters
+++ b/src/mongo/s/mongos.vcxproj.filters
@@ -293,8 +293,8 @@
     <ClCompile Include="..\client\syncclusterconnection.cpp">
       <Filter>client</Filter>
     </ClCompile>
-    <ClCompile Include="..\db\commands\pipeline.cpp">
-      <Filter>db\commands</Filter>
+    <ClCompile Include="..\db\pipeline\pipeline.cpp">
+      <Filter>db\pipeline</Filter>
     </ClCompile>
     <ClCompile Include="..\db\stats\top.cpp">
       <Filter>db\stats</Filter>
@@ -516,7 +516,7 @@
     <ClCompile Include="..\db\pipeline\document_source_bson_array.cpp">
       <Filter>db\pipeline\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\db\pipeline\document_source_command_futures.cpp">
+    <ClCompile Include="..\db\pipeline\document_source_command_shards.cpp">
       <Filter>db\pipeline\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\db\pipeline\document_source_filter.cpp">
@@ -735,7 +735,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\pch.h" />
-    <ClInclude Include="..\db\commands\pipeline.h">
+    <ClInclude Include="..\db\pipeline\pipeline.h">
       <Filter>db\commands</Filter>
     </ClInclude>
     <ClInclude Include="..\util\concurrency\remap_lock.h">
@@ -1074,4 +1074,4 @@
       <Filter>third_party\SpiderMonkey\Header Files</Filter>
     </None>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>