9 files changed, 34 insertions, 30 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
diff --git a/test/buildtool/TARGETS b/test/buildtool/TARGETS
index 3e70f462..a07928af 100644
--- a/test/buildtool/TARGETS
+++ b/test/buildtool/TARGETS
@@ -11,6 +11,7 @@
     , [["./", "graph_traverser", "TESTS"], "graph_traverser"]
     , [["./", "logging", "TESTS"], "logging"]
     , [["./", "multithreading", "TESTS"], "multithreading"]
+    , [["./", "system", "TESTS"], "system"]
     ]
   }
 }
diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS
index fdb2296d..c7fe3bda 100644
--- a/test/buildtool/file_system/TARGETS
+++ b/test/buildtool/file_system/TARGETS
@@ -10,17 +10,6 @@
     ]
   , "stage": ["test", "buildtool", "file_system"]
   }
-, "system_command":
-  { "type": ["@", "rules", "CC/test", "test"]
-  , "name": ["system_command"]
-  , "srcs": ["system_command.test.cpp"]
-  , "deps":
-    [ ["@", "catch2", "", "catch2"]
-    , ["test", "catch-main"]
-    , ["src/buildtool/file_system", "system_command"]
-    ]
-  , "stage": ["test", "buildtool", "file_system"]
-  }
 , "git_tree":
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["git_tree"]
@@ -57,6 +46,6 @@
 , "TESTS":
   { "type": "install"
   , "tainted": ["test"]
-  , "deps": ["file_root", "file_system_manager", "git_tree", "system_command"]
+  , "deps": ["file_root", "file_system_manager", "git_tree"]
   }
-}
-\ No newline at end of file
+}
diff --git a/test/buildtool/system/TARGETS b/test/buildtool/system/TARGETS
new file mode 100644
index 00000000..97101bae
--- /dev/null
+++ b/test/buildtool/system/TARGETS
@@ -0,0 +1,13 @@
+{ "system_command":
+  { "type": ["@", "rules", "CC/test", "test"]
+  , "name": ["system_command"]
+  , "srcs": ["system_command.test.cpp"]
+  , "deps":
+    [ ["@", "catch2", "", "catch2"]
+    , ["test", "catch-main"]
+    , ["src/buildtool/system", "system_command"]
+    ]
+  , "stage": ["test", "buildtool", "system"]
+  }
+, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["system_command"]}
+}
diff --git a/test/buildtool/file_system/system_command.test.cpp b/test/buildtool/system/system_command.test.cpp
index 81b4e2b6..6b3777ee 100644
--- a/test/buildtool/file_system/system_command.test.cpp
+++ b/test/buildtool/system/system_command.test.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 
 #include "catch2/catch.hpp"
-#include "src/buildtool/file_system/system_command.hpp"
+#include "src/buildtool/system/system_command.hpp"
 
 namespace {
 [[nodiscard]] auto GetTestDir() -> std::filesystem::path {