diff --git a/selfdrive/ui/sunnypilot/SConscript b/selfdrive/ui/sunnypilot/SConscript
index e542c21628..a8a70f98b0 100644
--- a/selfdrive/ui/sunnypilot/SConscript
+++ b/selfdrive/ui/sunnypilot/SConscript
@@ -56,11 +56,11 @@ osm_panel_qt_src = [
   "sunnypilot/qt/offroad/settings/osm/models_fetcher.cc",
 ]
 
-slc_panel_qt_src = [
-  "sunnypilot/qt/offroad/settings/slc/speed_limit_control.cc",
-  "sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc",
-  "sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc",
-  "sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc",
+longitudinal_panel_qt_src = [
+  "sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.cc",
+  "sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.cc",
+  "sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.cc",
+  "sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.cc",
 ]
 
 vehicle_panel_qt_src = [
@@ -85,7 +85,7 @@ brand_settings_qt_src = [
 ]
 
 sp_widgets_src = widgets_src + network_src
-sp_qt_src = qt_src + lateral_panel_qt_src + vehicle_panel_qt_src + brand_settings_qt_src + osm_panel_qt_src + slc_panel_qt_src
+sp_qt_src = qt_src + lateral_panel_qt_src + vehicle_panel_qt_src + brand_settings_qt_src + osm_panel_qt_src + longitudinal_panel_qt_src
 sp_qt_util = qt_util
 
 Export('sp_widgets_src', 'sp_qt_src', "sp_qt_util")
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.cc
similarity index 89%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.cc
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.cc
index 0b287ae9c7..a3582691fa 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.cc
@@ -5,7 +5,7 @@
  * See the LICENSE.md file in the root directory for more details.
  */
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h"
 
 SpeedLimitControl::SpeedLimitControl(const QString &param, const QString &title, const QString &desc, const QString &icon, QWidget *parent)
     : ExpandableToggleRow(param, title, desc, icon, parent) {
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h
similarity index 100%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.cc
similarity index 94%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.cc
index 12b043b9a0..902a89a23a 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.cc
@@ -5,7 +5,7 @@
  * See the LICENSE.md file in the root directory for more details.
  */
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.h"
 
 SpeedLimitControlPolicy::SpeedLimitControlPolicy(QWidget *parent) : QWidget(parent) {
   QVBoxLayout* main_layout = new QVBoxLayout(this);
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.h
similarity index 95%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.h
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.h
index eae851dcab..faff7e0f14 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.h
@@ -9,7 +9,7 @@
 
 #include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
 class SpeedLimitControlPolicy : public QWidget {
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.cc
similarity index 97%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.cc
index 685945cc71..720bd05beb 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.cc
@@ -5,7 +5,7 @@
  * See the LICENSE.md file in the root directory for more details.
  */
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.h"
 
 SpeedLimitControlSubpanel::SpeedLimitControlSubpanel(QWidget *parent) : QStackedWidget(parent) {
   subPanelFrame = new QFrame();
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.h
similarity index 88%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.h
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.h
index 092e148ae5..b279e80566 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.h
@@ -9,9 +9,9 @@
 
 #include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_policy.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
 class SpeedLimitControlSubpanel : public QStackedWidget {
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.cc
similarity index 93%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.cc
index f530c23d02..d9f60b9aec 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.cc
@@ -5,7 +5,7 @@
  * See the LICENSE.md file in the root directory for more details.
  */
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.h"
 
 SpeedLimitControlWarning::SpeedLimitControlWarning(QWidget *parent) : QWidget(parent) {
   QVBoxLayout* main_layout = new QVBoxLayout(this);
@@ -23,8 +23,8 @@ SpeedLimitControlWarning::SpeedLimitControlWarning(QWidget *parent) : QWidget(pa
 
   std::vector<QString> slc_warning_texts{
     SLCWarningTypeText[static_cast<int>(SLCWarningType::OFF)],
-  SLCWarningTypeText[static_cast<int>(SLCWarningType::DISPLAY)],
-  SLCWarningTypeText[static_cast<int>(SLCWarningType::CHIME)]};
+    SLCWarningTypeText[static_cast<int>(SLCWarningType::DISPLAY)],
+    SLCWarningTypeText[static_cast<int>(SLCWarningType::CHIME)]};
   slc_warning_settings = new ButtonParamControlSP(
     "SpeedLimitWarningType", tr("Speed Limit Warning"),
     "",
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.h
similarity index 96%
rename from selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.h
rename to selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.h
index f66c68daf1..7ce0a1ee7a 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_warning.h
@@ -9,7 +9,7 @@
 
 #include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
 class SpeedLimitControlWarning : public QWidget {
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
index e3486328b5..c7f4e5c2d2 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
@@ -9,8 +9,8 @@
 
 #include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/slc/speed_limit_control_subpanel.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class LongitudinalPanel : public QWidget {