diff --git a/.gitignore b/.gitignore
index aab3254d1..2babef47d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,16 +57,6 @@ docs/_build/
 # PyBuilder
 target/
 
-# Stored PDFs
-media/documents/*.gpg
-media/documents/thumbnails/*
-media/documents/originals/*
-media/overrides.css
-media/overrides.js
-
-# Sqlite database
-db.sqlite3
-db.sqlite3-journal
 
 # PyCharm
 .idea
@@ -85,7 +75,12 @@ scripts/nuke
 # Static files collected by the collectstatic command
 static/
 
-# Classification Models
-models/
+# Stored PDFs
+/data/documents/*
+/data/thumbnails/*
+/data/classification_model.pickle
+/data/db.sqlite3
+/data/index
 
 /paperless.conf
+/consumption/
diff --git a/media/documents/originals/.keep b/data/documents/.keep
similarity index 100%
rename from media/documents/originals/.keep
rename to data/documents/.keep
diff --git a/media/documents/thumbnails/.keep b/data/index/.keep
similarity index 100%
rename from media/documents/thumbnails/.keep
rename to data/index/.keep
diff --git a/models/.keep b/models/.keep
deleted file mode 100644
index e69de29bb..000000000