diff --git a/src/apps/Jamfile b/src/apps/Jamfile
index 14af4180cf..62fc75d9ba 100644
--- a/src/apps/Jamfile
+++ b/src/apps/Jamfile
@@ -15,6 +15,7 @@ HaikuSubInclude debuganalyzer ;
 HaikuSubInclude debugger ;
 HaikuSubInclude deskbar ;
 HaikuSubInclude deskcalc ;
+HaikuSubInclude devices ;
 HaikuSubInclude diskprobe ;
 HaikuSubInclude diskusage ;
 HaikuSubInclude drivesetup ;
diff --git a/src/preferences/devices/ConfigurationWindow.cpp b/src/apps/devices/ConfigurationWindow.cpp
similarity index 100%
rename from src/preferences/devices/ConfigurationWindow.cpp
rename to src/apps/devices/ConfigurationWindow.cpp
diff --git a/src/preferences/devices/Devices.cpp b/src/apps/devices/Devices.cpp
similarity index 100%
rename from src/preferences/devices/Devices.cpp
rename to src/apps/devices/Devices.cpp
diff --git a/src/preferences/devices/Devices.rdef b/src/apps/devices/Devices.rdef
similarity index 100%
rename from src/preferences/devices/Devices.rdef
rename to src/apps/devices/Devices.rdef
diff --git a/src/preferences/devices/DevicesInfo.cpp b/src/apps/devices/DevicesInfo.cpp
similarity index 100%
rename from src/preferences/devices/DevicesInfo.cpp
rename to src/apps/devices/DevicesInfo.cpp
diff --git a/src/preferences/devices/DevicesInfo.h b/src/apps/devices/DevicesInfo.h
similarity index 100%
rename from src/preferences/devices/DevicesInfo.h
rename to src/apps/devices/DevicesInfo.h
diff --git a/src/preferences/devices/DevicesWindow.cpp b/src/apps/devices/DevicesWindow.cpp
similarity index 100%
rename from src/preferences/devices/DevicesWindow.cpp
rename to src/apps/devices/DevicesWindow.cpp
diff --git a/src/preferences/devices/DevicesWindows.h b/src/apps/devices/DevicesWindows.h
similarity index 100%
rename from src/preferences/devices/DevicesWindows.h
rename to src/apps/devices/DevicesWindows.h
diff --git a/src/preferences/devices/Jamfile b/src/apps/devices/Jamfile
similarity index 97%
rename from src/preferences/devices/Jamfile
rename to src/apps/devices/Jamfile
index fd4d21c572..6dc623f700 100644
--- a/src/preferences/devices/Jamfile
+++ b/src/apps/devices/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src preferences devices ;
+SubDir HAIKU_TOP src apps devices ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/preferences/devices/ModemWindow.cpp b/src/apps/devices/ModemWindow.cpp
similarity index 100%
rename from src/preferences/devices/ModemWindow.cpp
rename to src/apps/devices/ModemWindow.cpp
diff --git a/src/preferences/devices/ResourceUsageWindow.cpp b/src/apps/devices/ResourceUsageWindow.cpp
similarity index 100%
rename from src/preferences/devices/ResourceUsageWindow.cpp
rename to src/apps/devices/ResourceUsageWindow.cpp
diff --git a/src/preferences/devices/cm_wrapper.c b/src/apps/devices/cm_wrapper.c
similarity index 100%
rename from src/preferences/devices/cm_wrapper.c
rename to src/apps/devices/cm_wrapper.c
diff --git a/src/preferences/devices/cm_wrapper.h b/src/apps/devices/cm_wrapper.h
similarity index 100%
rename from src/preferences/devices/cm_wrapper.h
rename to src/apps/devices/cm_wrapper.h
diff --git a/src/preferences/devices/config_driver.h b/src/apps/devices/config_driver.h
similarity index 100%
rename from src/preferences/devices/config_driver.h
rename to src/apps/devices/config_driver.h
diff --git a/src/preferences/devices/devlist2h.awk b/src/apps/devices/devlist2h.awk
similarity index 100%
rename from src/preferences/devices/devlist2h.awk
rename to src/apps/devices/devlist2h.awk
diff --git a/src/preferences/devices/isapnp_devids.txt b/src/apps/devices/isapnp_devids.txt
similarity index 100%
rename from src/preferences/devices/isapnp_devids.txt
rename to src/apps/devices/isapnp_devids.txt
diff --git a/src/preferences/devices/pci-header.awk b/src/apps/devices/pci-header.awk
similarity index 100%
rename from src/preferences/devices/pci-header.awk
rename to src/apps/devices/pci-header.awk
diff --git a/src/preferences/devices/pci.ids b/src/apps/devices/pci.ids
similarity index 100%
rename from src/preferences/devices/pci.ids
rename to src/apps/devices/pci.ids
diff --git a/src/preferences/devices/usb_devlist2h.awk b/src/apps/devices/usb_devlist2h.awk
similarity index 100%
rename from src/preferences/devices/usb_devlist2h.awk
rename to src/apps/devices/usb_devlist2h.awk
diff --git a/src/preferences/devices/usbdevs b/src/apps/devices/usbdevs
similarity index 100%
rename from src/preferences/devices/usbdevs
rename to src/apps/devices/usbdevs
diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile
index 2b68b2f49c..95b8c7b278 100644
--- a/src/preferences/Jamfile
+++ b/src/preferences/Jamfile
@@ -6,7 +6,6 @@ SubInclude HAIKU_TOP src preferences bluetooth ;
 SubInclude HAIKU_TOP src preferences cpufrequency ;
 SubInclude HAIKU_TOP src preferences datatranslations ;
 SubInclude HAIKU_TOP src preferences deskbar ;
-SubInclude HAIKU_TOP src preferences devices ;
 #SubInclude HAIKU_TOP src preferences dun ;
 SubInclude HAIKU_TOP src preferences filetypes ;
 SubInclude HAIKU_TOP src preferences fonts ;