diff --git a/core/command/app/checkcode.php b/core/Command/App/CheckCode.php
similarity index 100%
rename from core/command/app/checkcode.php
rename to core/Command/App/CheckCode.php
diff --git a/core/command/app/disable.php b/core/Command/App/Disable.php
similarity index 100%
rename from core/command/app/disable.php
rename to core/Command/App/Disable.php
diff --git a/core/command/app/enable.php b/core/Command/App/Enable.php
similarity index 100%
rename from core/command/app/enable.php
rename to core/Command/App/Enable.php
diff --git a/core/command/app/getpath.php b/core/Command/App/GetPath.php
similarity index 100%
rename from core/command/app/getpath.php
rename to core/Command/App/GetPath.php
diff --git a/core/command/app/listapps.php b/core/Command/App/ListApps.php
similarity index 100%
rename from core/command/app/listapps.php
rename to core/Command/App/ListApps.php
diff --git a/core/command/background/ajax.php b/core/Command/Background/Ajax.php
similarity index 100%
rename from core/command/background/ajax.php
rename to core/Command/Background/Ajax.php
diff --git a/core/command/background/base.php b/core/Command/Background/Base.php
similarity index 100%
rename from core/command/background/base.php
rename to core/Command/Background/Base.php
diff --git a/core/command/background/cron.php b/core/Command/Background/Cron.php
similarity index 100%
rename from core/command/background/cron.php
rename to core/Command/Background/Cron.php
diff --git a/core/command/background/webcron.php b/core/Command/Background/WebCron.php
similarity index 100%
rename from core/command/background/webcron.php
rename to core/Command/Background/WebCron.php
diff --git a/core/command/base.php b/core/Command/Base.php
similarity index 100%
rename from core/command/base.php
rename to core/Command/Base.php
diff --git a/core/command/check.php b/core/Command/Check.php
similarity index 100%
rename from core/command/check.php
rename to core/Command/Check.php
diff --git a/core/command/config/app/deleteconfig.php b/core/Command/Config/App/DeleteConfig.php
similarity index 100%
rename from core/command/config/app/deleteconfig.php
rename to core/Command/Config/App/DeleteConfig.php
diff --git a/core/command/config/app/getconfig.php b/core/Command/Config/App/GetConfig.php
similarity index 100%
rename from core/command/config/app/getconfig.php
rename to core/Command/Config/App/GetConfig.php
diff --git a/core/command/config/app/setconfig.php b/core/Command/Config/App/SetConfig.php
similarity index 100%
rename from core/command/config/app/setconfig.php
rename to core/Command/Config/App/SetConfig.php
diff --git a/core/command/config/import.php b/core/Command/Config/Import.php
similarity index 100%
rename from core/command/config/import.php
rename to core/Command/Config/Import.php
diff --git a/core/command/config/listconfigs.php b/core/Command/Config/ListConfigs.php
similarity index 100%
rename from core/command/config/listconfigs.php
rename to core/Command/Config/ListConfigs.php
diff --git a/core/command/config/system/deleteconfig.php b/core/Command/Config/System/DeleteConfig.php
similarity index 100%
rename from core/command/config/system/deleteconfig.php
rename to core/Command/Config/System/DeleteConfig.php
diff --git a/core/command/config/system/getconfig.php b/core/Command/Config/System/GetConfig.php
similarity index 100%
rename from core/command/config/system/getconfig.php
rename to core/Command/Config/System/GetConfig.php
diff --git a/core/command/config/system/setconfig.php b/core/Command/Config/System/SetConfig.php
similarity index 100%
rename from core/command/config/system/setconfig.php
rename to core/Command/Config/System/SetConfig.php
diff --git a/core/command/db/converttype.php b/core/Command/Db/ConvertType.php
similarity index 100%
rename from core/command/db/converttype.php
rename to core/Command/Db/ConvertType.php
diff --git a/core/command/db/generatechangescript.php b/core/Command/Db/GenerateChangeScript.php
similarity index 100%
rename from core/command/db/generatechangescript.php
rename to core/Command/Db/GenerateChangeScript.php
diff --git a/core/command/encryption/changekeystorageroot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php
similarity index 100%
rename from core/command/encryption/changekeystorageroot.php
rename to core/Command/Encryption/ChangeKeyStorageRoot.php
diff --git a/core/command/encryption/decryptall.php b/core/Command/Encryption/DecryptAll.php
similarity index 100%
rename from core/command/encryption/decryptall.php
rename to core/Command/Encryption/DecryptAll.php
diff --git a/core/command/encryption/disable.php b/core/Command/Encryption/Disable.php
similarity index 100%
rename from core/command/encryption/disable.php
rename to core/Command/Encryption/Disable.php
diff --git a/core/command/encryption/enable.php b/core/Command/Encryption/Enable.php
similarity index 100%
rename from core/command/encryption/enable.php
rename to core/Command/Encryption/Enable.php
diff --git a/core/command/encryption/encryptall.php b/core/Command/Encryption/EncryptAll.php
similarity index 100%
rename from core/command/encryption/encryptall.php
rename to core/Command/Encryption/EncryptAll.php
diff --git a/core/command/encryption/listmodules.php b/core/Command/Encryption/ListModules.php
similarity index 100%
rename from core/command/encryption/listmodules.php
rename to core/Command/Encryption/ListModules.php
diff --git a/core/command/encryption/setdefaultmodule.php b/core/Command/Encryption/SetDefaultModule.php
similarity index 100%
rename from core/command/encryption/setdefaultmodule.php
rename to core/Command/Encryption/SetDefaultModule.php
diff --git a/core/command/encryption/showkeystorageroot.php b/core/Command/Encryption/ShowKeyStorageRoot.php
similarity index 100%
rename from core/command/encryption/showkeystorageroot.php
rename to core/Command/Encryption/ShowKeyStorageRoot.php
diff --git a/core/command/encryption/status.php b/core/Command/Encryption/Status.php
similarity index 100%
rename from core/command/encryption/status.php
rename to core/Command/Encryption/Status.php
diff --git a/core/command/integrity/checkapp.php b/core/Command/Integrity/CheckApp.php
similarity index 100%
rename from core/command/integrity/checkapp.php
rename to core/Command/Integrity/CheckApp.php
diff --git a/core/command/integrity/checkcore.php b/core/Command/Integrity/CheckCore.php
similarity index 100%
rename from core/command/integrity/checkcore.php
rename to core/Command/Integrity/CheckCore.php
diff --git a/core/command/integrity/signapp.php b/core/Command/Integrity/SignApp.php
similarity index 100%
rename from core/command/integrity/signapp.php
rename to core/Command/Integrity/SignApp.php
diff --git a/core/command/integrity/signcore.php b/core/Command/Integrity/SignCore.php
similarity index 100%
rename from core/command/integrity/signcore.php
rename to core/Command/Integrity/SignCore.php
diff --git a/core/command/l10n/createjs.php b/core/Command/L10n/CreateJs.php
similarity index 100%
rename from core/command/l10n/createjs.php
rename to core/Command/L10n/CreateJs.php
diff --git a/core/command/log/manage.php b/core/Command/Log/Manage.php
similarity index 100%
rename from core/command/log/manage.php
rename to core/Command/Log/Manage.php
diff --git a/core/command/log/owncloud.php b/core/Command/Log/OwnCloud.php
similarity index 100%
rename from core/command/log/owncloud.php
rename to core/Command/Log/OwnCloud.php
diff --git a/core/command/maintenance/install.php b/core/Command/Maintenance/Install.php
similarity index 100%
rename from core/command/maintenance/install.php
rename to core/Command/Maintenance/Install.php
diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/Command/Maintenance/Mimetype/UpdateDB.php
similarity index 100%
rename from core/command/maintenance/mimetype/updatedb.php
rename to core/Command/Maintenance/Mimetype/UpdateDB.php
diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/Command/Maintenance/Mimetype/UpdateJS.php
similarity index 100%
rename from core/command/maintenance/mimetype/updatejs.php
rename to core/Command/Maintenance/Mimetype/UpdateJS.php
diff --git a/core/command/maintenance/mode.php b/core/Command/Maintenance/Mode.php
similarity index 100%
rename from core/command/maintenance/mode.php
rename to core/Command/Maintenance/Mode.php
diff --git a/core/command/maintenance/repair.php b/core/Command/Maintenance/Repair.php
similarity index 100%
rename from core/command/maintenance/repair.php
rename to core/Command/Maintenance/Repair.php
diff --git a/core/command/maintenance/singleuser.php b/core/Command/Maintenance/SingleUser.php
similarity index 100%
rename from core/command/maintenance/singleuser.php
rename to core/Command/Maintenance/SingleUser.php
diff --git a/core/command/security/importcertificate.php b/core/Command/Security/ImportCertificate.php
similarity index 100%
rename from core/command/security/importcertificate.php
rename to core/Command/Security/ImportCertificate.php
diff --git a/core/command/security/listcertificates.php b/core/Command/Security/ListCertificates.php
similarity index 100%
rename from core/command/security/listcertificates.php
rename to core/Command/Security/ListCertificates.php
diff --git a/core/command/security/removecertificate.php b/core/Command/Security/RemoveCertificate.php
similarity index 100%
rename from core/command/security/removecertificate.php
rename to core/Command/Security/RemoveCertificate.php
diff --git a/core/command/status.php b/core/Command/Status.php
similarity index 100%
rename from core/command/status.php
rename to core/Command/Status.php
diff --git a/core/command/upgrade.php b/core/Command/Upgrade.php
similarity index 100%
rename from core/command/upgrade.php
rename to core/Command/Upgrade.php
diff --git a/core/command/user/add.php b/core/Command/User/Add.php
similarity index 100%
rename from core/command/user/add.php
rename to core/Command/User/Add.php
diff --git a/core/command/user/delete.php b/core/Command/User/Delete.php
similarity index 100%
rename from core/command/user/delete.php
rename to core/Command/User/Delete.php
diff --git a/core/command/user/lastseen.php b/core/Command/User/LastSeen.php
similarity index 100%
rename from core/command/user/lastseen.php
rename to core/Command/User/LastSeen.php
diff --git a/core/command/user/report.php b/core/Command/User/Report.php
similarity index 100%
rename from core/command/user/report.php
rename to core/Command/User/Report.php
diff --git a/core/command/user/resetpassword.php b/core/Command/User/ResetPassword.php
similarity index 100%
rename from core/command/user/resetpassword.php
rename to core/Command/User/ResetPassword.php
diff --git a/core/controller/avatarcontroller.php b/core/Controller/AvatarController.php
similarity index 100%
rename from core/controller/avatarcontroller.php
rename to core/Controller/AvatarController.php
diff --git a/core/controller/lostcontroller.php b/core/Controller/LostController.php
similarity index 100%
rename from core/controller/lostcontroller.php
rename to core/Controller/LostController.php
diff --git a/core/controller/setupcontroller.php b/core/Controller/SetupController.php
similarity index 100%
rename from core/controller/setupcontroller.php
rename to core/Controller/SetupController.php
diff --git a/core/controller/usercontroller.php b/core/Controller/UserController.php
similarity index 100%
rename from core/controller/usercontroller.php
rename to core/Controller/UserController.php
diff --git a/core/tags/controller.php b/core/Tags/Controller.php
similarity index 100%
rename from core/tags/controller.php
rename to core/Tags/Controller.php