diff --git a/selfdrive/hardware/base.h b/selfdrive/hardware/base.h
new file mode 100644
index 0000000000..8df7d17825
--- /dev/null
+++ b/selfdrive/hardware/base.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdlib>
+#include <fstream>
+
+
+// no-op base hw class
+class HardwareNone {
+public:
+  static constexpr float MAX_VOLUME = 0;
+  static constexpr float MIN_VOLUME = 0;
+
+  static std::string get_os_version() { return "openpilot for PC"; };
+
+  static void reboot() {};
+  static void poweroff() {};
+  static void set_brightness(int percent) {};
+
+  static bool get_ssh_enabled() { return false; };
+  static void set_ssh_enabled(bool enabled) {};
+};
diff --git a/selfdrive/hardware/eon/hardware.h b/selfdrive/hardware/eon/hardware.h
new file mode 100644
index 0000000000..0a607a90e9
--- /dev/null
+++ b/selfdrive/hardware/eon/hardware.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <cstdlib>
+#include <fstream>
+
+#include "selfdrive/common/util.h"
+#include "selfdrive/hardware/base.h"
+
+class HardwareEon : public HardwareNone {
+public:
+  static constexpr float MAX_VOLUME = 1.0;
+  static constexpr float MIN_VOLUME = 0.5;
+
+  static std::string get_os_version() {
+    return "NEOS " + util::read_file("/VERSION");
+  };
+
+  static void reboot() { std::system("reboot"); };
+  static void poweroff() { std::system("LD_LIBRARY_PATH= svc power shutdown"); };
+  static void set_brightness(int percent) {
+    std::ofstream brightness_control("/sys/class/leds/lcd-backlight/brightness");
+    if (brightness_control.is_open()) {
+      brightness_control << (int)(percent * (255/100.)) << "\n";
+      brightness_control.close();
+    }
+  };
+
+  static bool get_ssh_enabled() {
+    return std::system("getprop persist.neos.ssh | grep -qF '1'") == 0;
+  };
+  static void set_ssh_enabled(bool enabled) {
+    std::string cmd = util::string_format("setprop persist.neos.ssh %d", enabled ? 1 : 0);
+    std::system(cmd.c_str());
+  };
+};
diff --git a/selfdrive/hardware/hw.h b/selfdrive/hardware/hw.h
index c4086c9dde..542eee6141 100644
--- a/selfdrive/hardware/hw.h
+++ b/selfdrive/hardware/hw.h
@@ -1,82 +1,11 @@
 #pragma once
 
-#include <cstdlib>
-#include <fstream>
-
-#include <common/util.h>
-
 #ifdef QCOM
+#include "selfdrive/hardware/eon/hardware.h"
 #define Hardware HardwareEon
 #elif QCOM2
+#include "selfdrive/hardware/tici/hardware.h"
 #define Hardware HardwareTici
 #else
 #define Hardware HardwareNone
 #endif
-
-
-// no-op base hw class
-class HardwareNone {
-public:
-  static constexpr float MAX_VOLUME = 0;
-  static constexpr float MIN_VOLUME = 0;
-
-  static std::string get_os_version() { return "openpilot for PC"; };
-
-  static void reboot() {};
-  static void poweroff() {};
-  static void set_brightness(int percent) {};
-
-  static bool get_ssh_enabled() { return false; };
-  static void set_ssh_enabled(bool enabled) {};
-};
-
-class HardwareEon : public HardwareNone {
-public:
-  static constexpr float MAX_VOLUME = 1.0;
-  static constexpr float MIN_VOLUME = 0.5;
-
-  static std::string get_os_version() {
-    return "NEOS " + util::read_file("/VERSION");
-  };
-
-  static void reboot() { std::system("reboot"); };
-  static void poweroff() { std::system("LD_LIBRARY_PATH= svc power shutdown"); };
-  static void set_brightness(int percent) {
-    std::ofstream brightness_control("/sys/class/leds/lcd-backlight/brightness");
-    if (brightness_control.is_open()) {
-      brightness_control << (int)(percent * (255/100.)) << "\n";
-      brightness_control.close();
-    }
-  };
-
-  static bool get_ssh_enabled() {
-    return std::system("getprop persist.neos.ssh | grep -qF '1'") == 0;
-  };
-  static void set_ssh_enabled(bool enabled) {
-    std::string cmd = util::string_format("setprop persist.neos.ssh %d", enabled ? 1 : 0);
-    std::system(cmd.c_str());
-  };
-};
-
-class HardwareTici : public HardwareNone {
-public:
-  static constexpr float MAX_VOLUME = 0.5;
-  static constexpr float MIN_VOLUME = 0.4;
-
-  static std::string get_os_version() {
-    return "AGNOS " + util::read_file("/VERSION");
-  };
-
-  static void reboot() { std::system("sudo reboot"); };
-  static void poweroff() { std::system("sudo poweroff"); };
-  static void set_brightness(int percent) {
-    std::ofstream brightness_control("/sys/class/backlight/panel0-backlight/brightness");
-    if (brightness_control.is_open()) {
-      brightness_control << (percent * (int)(1023/100.)) << "\n";
-      brightness_control.close();
-    }
-  };
-
-  static bool get_ssh_enabled() { return Params().read_db_bool("SshEnabled"); };
-  static void set_ssh_enabled(bool enabled) { Params().write_db_value("SshEnabled", (enabled ? "1" : "0")); };
-};
diff --git a/selfdrive/hardware/tici/hardware.h b/selfdrive/hardware/tici/hardware.h
new file mode 100644
index 0000000000..034e01a862
--- /dev/null
+++ b/selfdrive/hardware/tici/hardware.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cstdlib>
+#include <fstream>
+
+#include "selfdrive/common/util.h"
+#include "selfdrive/common/params.h"
+#include "selfdrive/hardware/base.h"
+
+class HardwareTici : public HardwareNone {
+public:
+  static constexpr float MAX_VOLUME = 0.5;
+  static constexpr float MIN_VOLUME = 0.4;
+
+  static std::string get_os_version() {
+    return "AGNOS " + util::read_file("/VERSION");
+  };
+
+  static void reboot() { std::system("sudo reboot"); };
+  static void poweroff() { std::system("sudo poweroff"); };
+  static void set_brightness(int percent) {
+    std::ofstream brightness_control("/sys/class/backlight/panel0-backlight/brightness");
+    if (brightness_control.is_open()) {
+      brightness_control << (percent * (int)(1023/100.)) << "\n";
+      brightness_control.close();
+    }
+  };
+  static void set_display_power(bool on) {};
+
+  static bool get_ssh_enabled() { return Params().read_db_bool("SshEnabled"); };
+  static void set_ssh_enabled(bool enabled) { Params().write_db_value("SshEnabled", (enabled ? "1" : "0")); };
+};