5 files changed, 17 insertions, 16 deletions
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index b3e54597..398f00e4 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -27,8 +27,8 @@
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/file_system", "file_system_manager"]
-    , ["src/buildtool/file_system", "system_command"]
     , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/system", "system_command"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "local"]
diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp
index eac6ede8..37c3c085 100644
--- a/src/buildtool/execution_api/local/local_action.cpp
+++ b/src/buildtool/execution_api/local/local_action.cpp
@@ -8,7 +8,7 @@
 #include "src/buildtool/execution_api/local/local_response.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
-#include "src/buildtool/file_system/system_command.hpp"
+#include "src/buildtool/system/system_command.hpp"
 
 namespace {
 
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index 478b5903..ef817912 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -15,17 +15,6 @@
     ]
   , "stage": ["src", "buildtool", "file_system"]
   }
-, "system_command":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["system_command"]
-  , "hdrs": ["system_command.hpp"]
-  , "deps":
-    [ "file_system_manager"
-    , ["src/buildtool/logging", "logging"]
-    , ["@", "gsl-lite", "", "gsl-lite"]
-    ]
-  , "stage": ["src", "buildtool", "file_system"]
-  }
 , "jsonfs":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["jsonfs"]
diff --git a/src/buildtool/system/TARGETS b/src/buildtool/system/TARGETS
new file mode 100644
index 00000000..c5db3f83
--- /dev/null
+++ b/src/buildtool/system/TARGETS
@@ -0,0 +1,12 @@
+{ "system_command":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["system_command"]
+  , "hdrs": ["system_command.hpp"]
+  , "deps":
+    [ ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/logging", "logging"]
+    , ["@", "gsl-lite", "", "gsl-lite"]
+    ]
+  , "stage": ["src", "buildtool", "system"]
+  }
+}
diff --git a/src/buildtool/file_system/system_command.hpp b/src/buildtool/system/system_command.hpp
index 66470ade..53c92f21 100644
--- a/src/buildtool/file_system/system_command.hpp
+++ b/src/buildtool/system/system_command.hpp
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_EXECUTION_SYSTEM_HPP
-#define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_EXECUTION_SYSTEM_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_SYSTEM_SYSTEM_COMMAND_HPP
+#define INCLUDED_SRC_BUILDTOOL_SYSTEM_SYSTEM_COMMAND_HPP
 
 #include <array>
 #include <cstdio>
@@ -199,4 +199,4 @@ class SystemCommand {
     }
 };
 
-#endif  // INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_EXECUTION_SYSTEM_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_SYSTEM_SYSTEM_COMMAND_HPP