diff --git a/app/schemas/de.christinecoenen.code.zapp.app.mediathek.repository.persistence.MediathekDatabase/1.json b/app/schemas/de.christinecoenen.code.zapp.persistence.Database/1.json
similarity index 100%
rename from app/schemas/de.christinecoenen.code.zapp.app.mediathek.repository.persistence.MediathekDatabase/1.json
rename to app/schemas/de.christinecoenen.code.zapp.persistence.Database/1.json
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/ZappApplicationBase.java b/app/src/main/java/de/christinecoenen/code/zapp/app/ZappApplicationBase.java
index c85fb886..d3468aba 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/ZappApplicationBase.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/ZappApplicationBase.java
@@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatDelegate;
 
 import de.christinecoenen.code.zapp.app.mediathek.controller.downloads.DownloadController;
 import de.christinecoenen.code.zapp.app.mediathek.repository.MediathekRepository;
-import de.christinecoenen.code.zapp.app.mediathek.repository.persistence.MediathekDatabase;
+import de.christinecoenen.code.zapp.persistence.Database;
 import de.christinecoenen.code.zapp.app.player.IPlaybackPositionRepository;
 import de.christinecoenen.code.zapp.app.player.PersistedPlaybackPositionRepository;
 import de.christinecoenen.code.zapp.app.settings.repository.SettingsRepository;
@@ -52,9 +52,9 @@ public abstract class ZappApplicationBase extends Application {
 
 		channelRepository = new ChannelRepository(this);
 
-		MediathekDatabase mediathekDatabase = MediathekDatabase.Companion.getInstance(this);
+		Database database = Database.Companion.getInstance(this);
 
-		mediathekRepository = new MediathekRepository(mediathekDatabase);
+		mediathekRepository = new MediathekRepository(database);
 		playbackPositionRepository = new PersistedPlaybackPositionRepository(mediathekRepository);
 
 		downloadController = new DownloadController(this, mediathekRepository);
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/MediathekRepository.java b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/MediathekRepository.java
index 2b17b33f..687084b8 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/MediathekRepository.java
+++ b/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/MediathekRepository.java
@@ -8,11 +8,10 @@ import de.christinecoenen.code.zapp.app.mediathek.api.request.QueryRequest;
 import de.christinecoenen.code.zapp.app.mediathek.model.DownloadStatus;
 import de.christinecoenen.code.zapp.app.mediathek.model.MediathekShow;
 import de.christinecoenen.code.zapp.app.mediathek.model.PersistedMediathekShow;
-import de.christinecoenen.code.zapp.app.mediathek.repository.persistence.MediathekDatabase;
+import de.christinecoenen.code.zapp.persistence.Database;
 import de.christinecoenen.code.zapp.utils.api.UserAgentInterceptor;
 import io.reactivex.Completable;
 import io.reactivex.Flowable;
-import io.reactivex.Maybe;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ConnectionSpec;
@@ -27,11 +26,11 @@ public class MediathekRepository {
 
 
 	private final MediathekService service;
-	private final MediathekDatabase database;
+	private final Database database;
 
 
-	public MediathekRepository(MediathekDatabase mediathekDatabase) {
-		this.database = mediathekDatabase;
+	public MediathekRepository(Database database) {
+		this.database = database;
 
 		// workaround to avoid SSLHandshakeException on Android 7 devices
 		// see: https://stackoverflow.com/questions/39133437/sslhandshakeexception-handshake-failed-on-android-n-7-0
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/MediathekDatabase.kt b/app/src/main/java/de/christinecoenen/code/zapp/persistence/Database.kt
similarity index 62%
rename from app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/MediathekDatabase.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/persistence/Database.kt
index 75324b8e..3f61bf41 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/MediathekDatabase.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/persistence/Database.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.app.mediathek.repository.persistence
+package de.christinecoenen.code.zapp.persistence
 
 import android.content.Context
 import androidx.room.Database
@@ -9,13 +9,13 @@ import de.christinecoenen.code.zapp.app.mediathek.model.PersistedMediathekShow
 
 @Database(entities = [PersistedMediathekShow::class], version = 1, exportSchema = true)
 @TypeConverters(DownloadStatusConverter::class, DateTimeConverter::class)
-abstract class MediathekDatabase : RoomDatabase() {
+abstract class Database : RoomDatabase() {
 
 	companion object {
 
-		fun getInstance(applicationContext: Context): MediathekDatabase {
+		fun getInstance(applicationContext: Context): de.christinecoenen.code.zapp.persistence.Database {
 			return Room
-				.databaseBuilder(applicationContext, MediathekDatabase::class.java, "mediathek.db")
+				.databaseBuilder(applicationContext, de.christinecoenen.code.zapp.persistence.Database::class.java, "zapp.db")
 				.build()
 		}
 
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/DateTimeConverter.kt b/app/src/main/java/de/christinecoenen/code/zapp/persistence/DateTimeConverter.kt
similarity index 82%
rename from app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/DateTimeConverter.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/persistence/DateTimeConverter.kt
index 2ff79b05..bdfe9949 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/DateTimeConverter.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/persistence/DateTimeConverter.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.app.mediathek.repository.persistence
+package de.christinecoenen.code.zapp.persistence
 
 import androidx.room.TypeConverter
 import org.joda.time.DateTime
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/DownloadStatusConverter.kt b/app/src/main/java/de/christinecoenen/code/zapp/persistence/DownloadStatusConverter.kt
similarity index 84%
rename from app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/DownloadStatusConverter.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/persistence/DownloadStatusConverter.kt
index cc11578f..f8631086 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/DownloadStatusConverter.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/persistence/DownloadStatusConverter.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.app.mediathek.repository.persistence
+package de.christinecoenen.code.zapp.persistence
 
 import androidx.room.TypeConverter
 import de.christinecoenen.code.zapp.app.mediathek.model.DownloadStatus
diff --git a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/MediathekShowDao.kt b/app/src/main/java/de/christinecoenen/code/zapp/persistence/MediathekShowDao.kt
similarity index 97%
rename from app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/MediathekShowDao.kt
rename to app/src/main/java/de/christinecoenen/code/zapp/persistence/MediathekShowDao.kt
index 131804d3..51c3fbfa 100644
--- a/app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/repository/persistence/MediathekShowDao.kt
+++ b/app/src/main/java/de/christinecoenen/code/zapp/persistence/MediathekShowDao.kt
@@ -1,4 +1,4 @@
-package de.christinecoenen.code.zapp.app.mediathek.repository.persistence
+package de.christinecoenen.code.zapp.persistence
 
 import androidx.room.*
 import de.christinecoenen.code.zapp.app.mediathek.model.DownloadStatus