diff --git a/lib/appconfig.php b/lib/AppConfig.php
similarity index 100%
rename from lib/appconfig.php
rename to lib/AppConfig.php
diff --git a/lib/db.php b/lib/Db/DbBase.php
similarity index 98%
rename from lib/db.php
rename to lib/Db/DbBase.php
index 11efefb3..ff620ec9 100644
--- a/lib/db.php
+++ b/lib/Db/DbBase.php
@@ -9,13 +9,13 @@
  * later.
  */
 
-namespace OCA\Richdocuments;
+namespace OCA\Richdocuments\Db;
 
 /**
  * Generic DB class
  */
 
-abstract class Db {
+abstract class DbBase {
 
 	protected $data;
 
diff --git a/lib/db/wopi.php b/lib/Db/Wopi.php
similarity index 94%
rename from lib/db/wopi.php
rename to lib/Db/Wopi.php
index 45152f8e..d4b40c12 100644
--- a/lib/db/wopi.php
+++ b/lib/Db/Wopi.php
@@ -11,10 +11,7 @@
 
 namespace OCA\Richdocuments\Db;
 
-use \OCA\Richdocuments\Download;
-use \OCA\Richdocuments\DownloadResponse;
-
-class Wopi extends \OCA\Richdocuments\Db{
+class Wopi extends DbBase {
 
 	const DB_TABLE = '`*PREFIX*richdocuments_wopi`';
 
diff --git a/lib/helper.php b/lib/Helper.php
similarity index 100%
rename from lib/helper.php
rename to lib/Helper.php