diff --git a/.gitignore b/.gitignore
index 12f515d1d..ab9925768 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ test.php
 
 /.idea/
 /vendor/*
-/resources/nzb/*
+/storage/nzb/*
 /resources/tmp/*
 !/resources/tmp/unrar/
 !/resources/tmp/unzip/
diff --git a/composer.lock b/composer.lock
index d2e113237..73f464c7c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -18174,5 +18174,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/resources/covers/games/.gitignore b/resources/covers/games/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/games/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/movies/.gitignore b/resources/covers/movies/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/movies/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/music/.gitignore b/resources/covers/music/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/music/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/preview/.gitignore b/resources/covers/preview/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/preview/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/sample/.gitignore b/resources/covers/sample/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/sample/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/tvrage/.gitignore b/resources/covers/tvrage/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/tvrage/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/tvshows/.gitignore b/resources/covers/tvshows/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/tvshows/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/covers/video/.gitignore b/resources/covers/video/.gitignore
deleted file mode 100755
index d6b7ef32c..000000000
--- a/resources/covers/video/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/nzb/.gitignore b/resources/nzb/.gitignore
deleted file mode 100755
index c96a04f00..000000000
--- a/resources/nzb/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/resources/covers/anime/.gitignore b/storage/covers/anime/.gitignore
old mode 100755
new mode 100644
similarity index 52%
rename from resources/covers/anime/.gitignore
rename to storage/covers/anime/.gitignore
index d6b7ef32c..c1aefd201
--- a/resources/covers/anime/.gitignore
+++ b/storage/covers/anime/.gitignore
@@ -1,2 +1,2 @@
-*
+.gitignore
 !.gitignore
diff --git a/resources/covers/audio/.gitignore b/storage/covers/audio/.gitignore
old mode 100755
new mode 100644
similarity index 52%
rename from resources/covers/audio/.gitignore
rename to storage/covers/audio/.gitignore
index d6b7ef32c..c1aefd201
--- a/resources/covers/audio/.gitignore
+++ b/storage/covers/audio/.gitignore
@@ -1,2 +1,2 @@
-*
+.gitignore
 !.gitignore
diff --git a/resources/covers/audiosample/.gitignore b/storage/covers/audiosample/.gitignore
old mode 100755
new mode 100644
similarity index 52%
rename from resources/covers/audiosample/.gitignore
rename to storage/covers/audiosample/.gitignore
index d6b7ef32c..c1aefd201
--- a/resources/covers/audiosample/.gitignore
+++ b/storage/covers/audiosample/.gitignore
@@ -1,2 +1,2 @@
-*
+.gitignore
 !.gitignore
diff --git a/resources/covers/book/.gitignore b/storage/covers/book/.gitignore
old mode 100755
new mode 100644
similarity index 52%
rename from resources/covers/book/.gitignore
rename to storage/covers/book/.gitignore
index d6b7ef32c..c1aefd201
--- a/resources/covers/book/.gitignore
+++ b/storage/covers/book/.gitignore
@@ -1,2 +1,2 @@
-*
+.gitignore
 !.gitignore
diff --git a/resources/covers/console/.gitignore b/storage/covers/console/.gitignore
old mode 100755
new mode 100644
similarity index 70%
rename from resources/covers/console/.gitignore
rename to storage/covers/console/.gitignore
index 172cc9f02..22ef32201
--- a/resources/covers/console/.gitignore
+++ b/storage/covers/console/.gitignore
@@ -1,3 +1,3 @@
-*
+.gitignore
 !.gitignore
 !no-cover.jpg
diff --git a/resources/covers/console/no-cover.jpg b/storage/covers/console/no-cover.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from resources/covers/console/no-cover.jpg
rename to storage/covers/console/no-cover.jpg
diff --git a/storage/covers/games/.gitignore b/storage/covers/games/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/games/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/movies/.gitignore b/storage/covers/movies/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/movies/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/music/.gitignore b/storage/covers/music/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/music/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/preview/.gitignore b/storage/covers/preview/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/preview/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/sample/.gitignore b/storage/covers/sample/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/sample/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/tvrage/.gitignore b/storage/covers/tvrage/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/tvrage/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/tvshows/.gitignore b/storage/covers/tvshows/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/tvshows/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/storage/covers/video/.gitignore b/storage/covers/video/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/covers/video/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore
diff --git a/resources/covers/xxx/.gitignore b/storage/covers/xxx/.gitignore
old mode 100755
new mode 100644
similarity index 79%
rename from resources/covers/xxx/.gitignore
rename to storage/covers/xxx/.gitignore
index 82437b7a0..ba2606d59
--- a/resources/covers/xxx/.gitignore
+++ b/storage/covers/xxx/.gitignore
@@ -1,4 +1,4 @@
-*
+.gitignore
 !.gitignore
 !no-cover.jpg
 !no-backdrop.jpg
diff --git a/resources/covers/xxx/no-backdrop.jpg b/storage/covers/xxx/no-backdrop.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from resources/covers/xxx/no-backdrop.jpg
rename to storage/covers/xxx/no-backdrop.jpg
diff --git a/resources/covers/xxx/no-cover.jpg b/storage/covers/xxx/no-cover.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from resources/covers/xxx/no-cover.jpg
rename to storage/covers/xxx/no-cover.jpg
diff --git a/storage/nzb/.gitignore b/storage/nzb/.gitignore
new file mode 100644
index 000000000..c1aefd201
--- /dev/null
+++ b/storage/nzb/.gitignore
@@ -0,0 +1,2 @@
+.gitignore
+!.gitignore