diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/repository/MainRepository.java b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java
similarity index 96%
rename from app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/repository/MainRepository.java
rename to app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java
index f07ae9b8..0f13c76b 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/repository/MainRepository.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/data/repository/DefaultMainRepository.java
@@ -1,4 +1,4 @@
-package com.d4rk.androidtutorials.java.ui.screens.main.repository;
+package com.d4rk.androidtutorials.java.data.repository;
 
 import android.content.Context;
 import android.content.Intent;
@@ -18,13 +18,13 @@
  * Repository class that handles data operations such as SharedPreferences,
  * app update checks, etc.
  */
-public class MainRepository implements com.d4rk.androidtutorials.java.data.repository.MainRepository {
+public class DefaultMainRepository implements MainRepository {
 
     private final Context context;
     private final SharedPreferences defaultSharedPrefs;
     private final AppUpdateManager appUpdateManager;
 
-    public MainRepository(Context context) {
+    public DefaultMainRepository(Context context) {
         this.context = context.getApplicationContext();
         this.defaultSharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         this.appUpdateManager = AppUpdateManagerFactory.create(this.context);
diff --git a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
index afcca2e4..290a0df9 100644
--- a/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
+++ b/app/src/main/java/com/d4rk/androidtutorials/java/di/AppModule.java
@@ -6,8 +6,10 @@
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.d4rk.androidtutorials.java.data.repository.DefaultHomeRepository;
+import com.d4rk.androidtutorials.java.data.repository.DefaultMainRepository;
 import com.d4rk.androidtutorials.java.data.repository.DefaultQuizRepository;
 import com.d4rk.androidtutorials.java.data.repository.HomeRepository;
+import com.d4rk.androidtutorials.java.data.repository.MainRepository;
 import com.d4rk.androidtutorials.java.data.repository.QuizRepository;
 import com.d4rk.androidtutorials.java.data.source.DefaultHomeLocalDataSource;
 import com.d4rk.androidtutorials.java.data.source.DefaultHomeRemoteDataSource;
@@ -42,7 +44,6 @@
 import com.d4rk.androidtutorials.java.domain.support.QueryProductDetailsUseCase;
 import com.d4rk.androidtutorials.java.ui.screens.about.repository.AboutRepository;
 import com.d4rk.androidtutorials.java.ui.screens.help.repository.HelpRepository;
-import com.d4rk.androidtutorials.java.ui.screens.main.repository.MainRepository;
 import com.d4rk.androidtutorials.java.ui.screens.settings.repository.SettingsRepository;
 import com.d4rk.androidtutorials.java.ui.screens.startup.repository.StartupRepository;
 import com.d4rk.androidtutorials.java.ui.screens.support.repository.SupportRepository;
@@ -121,7 +122,7 @@ public GetCurrentYearUseCase provideGetCurrentYearUseCase(AboutRepository reposi
     @Provides
     @Singleton
     public MainRepository provideMainRepository(Application application) {
-        return new MainRepository(application);
+        return new DefaultMainRepository(application);
     }
 
     @Provides