diff --git a/lib/private/security/csp/contentsecuritypolicy.php b/lib/private/Security/CSP/ContentSecurityPolicy.php similarity index 100% rename from lib/private/security/csp/contentsecuritypolicy.php rename to lib/private/Security/CSP/ContentSecurityPolicy.php diff --git a/lib/private/security/csp/contentsecuritypolicymanager.php b/lib/private/Security/CSP/ContentSecurityPolicyManager.php similarity index 100% rename from lib/private/security/csp/contentsecuritypolicymanager.php rename to lib/private/Security/CSP/ContentSecurityPolicyManager.php diff --git a/lib/private/security/csrf/csrftoken.php b/lib/private/Security/CSRF/CsrfToken.php similarity index 100% rename from lib/private/security/csrf/csrftoken.php rename to lib/private/Security/CSRF/CsrfToken.php diff --git a/lib/private/security/csrf/csrftokengenerator.php b/lib/private/Security/CSRF/CsrfTokenGenerator.php similarity index 100% rename from lib/private/security/csrf/csrftokengenerator.php rename to lib/private/Security/CSRF/CsrfTokenGenerator.php diff --git a/lib/private/security/csrf/csrftokenmanager.php b/lib/private/Security/CSRF/CsrfTokenManager.php similarity index 100% rename from lib/private/security/csrf/csrftokenmanager.php rename to lib/private/Security/CSRF/CsrfTokenManager.php diff --git a/lib/private/security/csrf/tokenstorage/sessionstorage.php b/lib/private/Security/CSRF/TokenStorage/SessionStorage.php similarity index 100% rename from lib/private/security/csrf/tokenstorage/sessionstorage.php rename to lib/private/Security/CSRF/TokenStorage/SessionStorage.php diff --git a/lib/private/security/certificate.php b/lib/private/Security/Certificate.php similarity index 100% rename from lib/private/security/certificate.php rename to lib/private/Security/Certificate.php diff --git a/lib/private/security/certificatemanager.php b/lib/private/Security/CertificateManager.php similarity index 100% rename from lib/private/security/certificatemanager.php rename to lib/private/Security/CertificateManager.php diff --git a/lib/private/security/credentialsmanager.php b/lib/private/Security/CredentialsManager.php similarity index 100% rename from lib/private/security/credentialsmanager.php rename to lib/private/Security/CredentialsManager.php diff --git a/lib/private/security/crypto.php b/lib/private/Security/Crypto.php similarity index 100% rename from lib/private/security/crypto.php rename to lib/private/Security/Crypto.php diff --git a/lib/private/security/hasher.php b/lib/private/Security/Hasher.php similarity index 100% rename from lib/private/security/hasher.php rename to lib/private/Security/Hasher.php diff --git a/lib/private/security/securerandom.php b/lib/private/Security/SecureRandom.php similarity index 100% rename from lib/private/security/securerandom.php rename to lib/private/Security/SecureRandom.php diff --git a/lib/private/security/trusteddomainhelper.php b/lib/private/Security/TrustedDomainHelper.php similarity index 100% rename from lib/private/security/trusteddomainhelper.php rename to lib/private/Security/TrustedDomainHelper.php