diff --git a/clients/oxygen/config/CMakeLists.txt b/clients/oxygen/config/CMakeLists.txt
index add7a91c98..748b831583 100644
--- a/clients/oxygen/config/CMakeLists.txt
+++ b/clients/oxygen/config/CMakeLists.txt
@@ -17,11 +17,11 @@ set(kwin_oxygen_config_PART_SRCS
   )
 
 kde4_add_ui_files(kwin_oxygen_config_PART_SRCS
-   oxygenconfigurationui.ui
-   oxygendetectwidget.ui
-   oxygenexceptiondialog.ui
-   oxygenexceptionlistwidget.ui
-   oxygenshadowconfigurationui.ui
+   ui/oxygenconfigurationui.ui
+   ui/oxygendetectwidget.ui
+   ui/oxygenexceptiondialog.ui
+   ui/oxygenexceptionlistwidget.ui
+   ui/oxygenshadowconfigurationui.ui
 )
 
 kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS})
diff --git a/clients/oxygen/config/oxygenconfigurationui.ui b/clients/oxygen/config/ui/oxygenconfigurationui.ui
similarity index 100%
rename from clients/oxygen/config/oxygenconfigurationui.ui
rename to clients/oxygen/config/ui/oxygenconfigurationui.ui
diff --git a/clients/oxygen/config/oxygendetectwidget.ui b/clients/oxygen/config/ui/oxygendetectwidget.ui
similarity index 100%
rename from clients/oxygen/config/oxygendetectwidget.ui
rename to clients/oxygen/config/ui/oxygendetectwidget.ui
diff --git a/clients/oxygen/config/oxygenexceptiondialog.ui b/clients/oxygen/config/ui/oxygenexceptiondialog.ui
similarity index 100%
rename from clients/oxygen/config/oxygenexceptiondialog.ui
rename to clients/oxygen/config/ui/oxygenexceptiondialog.ui
diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.ui b/clients/oxygen/config/ui/oxygenexceptionlistwidget.ui
similarity index 100%
rename from clients/oxygen/config/oxygenexceptionlistwidget.ui
rename to clients/oxygen/config/ui/oxygenexceptionlistwidget.ui
diff --git a/clients/oxygen/config/oxygenshadowconfigurationui.ui b/clients/oxygen/config/ui/oxygenshadowconfigurationui.ui
similarity index 100%
rename from clients/oxygen/config/oxygenshadowconfigurationui.ui
rename to clients/oxygen/config/ui/oxygenshadowconfigurationui.ui