diff --git a/lib/private/certificate.php b/lib/private/certificate/certificate.php
similarity index 97%
rename from lib/private/certificate.php
rename to lib/private/certificate/certificate.php
index 294722bc66094d8ff6fe3e44a195c1154ad36302..801afa79167960be47d6a92b6f1f330666b4510d 100644
--- a/lib/private/certificate.php
+++ b/lib/private/certificate/certificate.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OC;
+namespace OC\Certificate;
 
 use OCP\ICertificate;
 
@@ -75,7 +75,7 @@ class Certificate implements ICertificate {
 	 * @return string
 	 */
 	public function getSerial() {
-		return $this->getSerial();
+		return $this->serial;
 	}
 
 	/**
diff --git a/lib/private/certificatemanager.php b/lib/private/certificate/certificatemanager.php
similarity index 99%
rename from lib/private/certificatemanager.php
rename to lib/private/certificate/certificatemanager.php
index 90a30182c65a6ea1965da20bd5571734fded9caf..c6207f057dc8f35ad30734efac21e306ce193b6a 100644
--- a/lib/private/certificatemanager.php
+++ b/lib/private/certificate/certificatemanager.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OC;
+namespace OC\Certificate;
 
 use OCP\ICertificateManager;
 
diff --git a/lib/private/server.php b/lib/private/server.php
index a30571c1e1395d74f8824c293dd30502e295b806..311001ce4076918a89d6da2dc15cd2a647cda5b1 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,6 +6,7 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
+use OC\Certificate\CertificateManager;
 use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
 use OC\Files\View;