diff --git a/release/files_common b/release/files_common
index 5259f40776..ef9f5266e1 100644
--- a/release/files_common
+++ b/release/files_common
@@ -200,8 +200,6 @@ selfdrive/controls/lib/longitudinal_mpc_lib/.gitignore
 selfdrive/controls/lib/lateral_mpc_lib/*
 selfdrive/controls/lib/longitudinal_mpc_lib/*
 
-selfdrive/hardware
-
 system/__init__.py
 
 system/hardware/__init__.py
diff --git a/selfdrive/athena/athenad.py b/selfdrive/athena/athenad.py
index 82c00b3bf2..70e18bbedb 100755
--- a/selfdrive/athena/athenad.py
+++ b/selfdrive/athena/athenad.py
@@ -40,7 +40,7 @@ from openpilot.system.loggerd.xattr_cache import getxattr, setxattr
 from openpilot.selfdrive.statsd import STATS_DIR
 from openpilot.system.swaglog import cloudlog
 from openpilot.system.version import get_commit, get_origin, get_short_branch, get_version
-from openpilot.selfdrive.hardware.hw import Paths
+from openpilot.system.hardware.hw import Paths
 
 
 # TODO: use socket constant when mypy recognizes this as a valid attribute
diff --git a/selfdrive/athena/tests/test_athenad.py b/selfdrive/athena/tests/test_athenad.py
index f4c229188e..27ccbdccc6 100755
--- a/selfdrive/athena/tests/test_athenad.py
+++ b/selfdrive/athena/tests/test_athenad.py
@@ -21,7 +21,7 @@ from openpilot.selfdrive.athena import athenad
 from openpilot.selfdrive.athena.athenad import MAX_RETRY_COUNT, dispatcher
 from openpilot.selfdrive.athena.tests.helpers import MockWebsocket, MockParams, MockApi, EchoSocket, with_http_server
 from cereal import messaging
-from openpilot.selfdrive.hardware.hw import Paths
+from openpilot.system.hardware.hw import Paths
 
 
 class TestAthenadMethods(unittest.TestCase):
diff --git a/selfdrive/hardware b/selfdrive/hardware
deleted file mode 120000
index 02a42c502f..0000000000
--- a/selfdrive/hardware
+++ /dev/null
@@ -1 +0,0 @@
-../system/hardware/
\ No newline at end of file
diff --git a/system/hardware/hw.py b/system/hardware/hw.py
index 3f7eac02e9..119ca48c86 100644
--- a/system/hardware/hw.py
+++ b/system/hardware/hw.py
@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 
-from openpilot.selfdrive.hardware import PC
+from openpilot.system.hardware import PC
 
 class Paths:
   @staticmethod
diff --git a/system/loggerd/config.py b/system/loggerd/config.py
index 0245585fc0..664e78b378 100644
--- a/system/loggerd/config.py
+++ b/system/loggerd/config.py
@@ -1,7 +1,7 @@
 import os
 from pathlib import Path
 from openpilot.system.hardware import PC
-from openpilot.selfdrive.hardware.hw import Paths
+from openpilot.system.hardware.hw import Paths
 
 
 CAMERA_FPS = 20
diff --git a/system/loggerd/tests/test_encoder.py b/system/loggerd/tests/test_encoder.py
index bec956a316..c46ac31b7f 100755
--- a/system/loggerd/tests/test_encoder.py
+++ b/system/loggerd/tests/test_encoder.py
@@ -16,7 +16,7 @@ from openpilot.common.timeout import Timeout
 from openpilot.system.hardware import TICI
 from openpilot.selfdrive.manager.process_config import managed_processes
 from openpilot.tools.lib.logreader import LogReader
-from openpilot.selfdrive.hardware.hw import Paths
+from openpilot.system.hardware.hw import Paths
 
 SEGMENT_LENGTH = 2
 FULL_SIZE = 2507572