diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/Controller/ThemingController.php
similarity index 100%
rename from apps/theming/lib/controller/themingcontroller.php
rename to apps/theming/lib/Controller/ThemingController.php
diff --git a/apps/theming/lib/template.php b/apps/theming/lib/Template.php
similarity index 100%
rename from apps/theming/lib/template.php
rename to apps/theming/lib/Template.php
diff --git a/apps/theming/lib/util.php b/apps/theming/lib/Util.php
similarity index 100%
rename from apps/theming/lib/util.php
rename to apps/theming/lib/Util.php
diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
similarity index 100%
rename from apps/theming/tests/lib/controller/ThemingControllerTest.php
rename to apps/theming/tests/Controller/ThemingControllerTest.php
diff --git a/apps/theming/tests/lib/TemplateTest.php b/apps/theming/tests/TemplateTest.php
similarity index 100%
rename from apps/theming/tests/lib/TemplateTest.php
rename to apps/theming/tests/TemplateTest.php
diff --git a/apps/theming/tests/lib/UtilTest.php b/apps/theming/tests/UtilTest.php
similarity index 100%
rename from apps/theming/tests/lib/UtilTest.php
rename to apps/theming/tests/UtilTest.php