diff --git a/app/src/main/java/com/shashank/moviedb/data/remote/MovieRepository.java b/app/src/main/java/com/shashank/moviedb/data/MovieRepository.java
similarity index 96%
rename from app/src/main/java/com/shashank/moviedb/data/remote/MovieRepository.java
rename to app/src/main/java/com/shashank/moviedb/data/MovieRepository.java
index 8cf8c6f..2a6b47d 100644
--- a/app/src/main/java/com/shashank/moviedb/data/remote/MovieRepository.java
+++ b/app/src/main/java/com/shashank/moviedb/data/MovieRepository.java
@@ -1,4 +1,4 @@
-package com.shashank.moviedb.data.remote;
+package com.shashank.moviedb.data;
 
 import com.shashank.moviedb.data.ResourceCallback;
 import com.shashank.moviedb.data.Resource;
diff --git a/app/src/main/java/com/shashank/moviedb/data/remote/MovieRepositoryImpl.java b/app/src/main/java/com/shashank/moviedb/data/MovieRepositoryImpl.java
similarity index 99%
rename from app/src/main/java/com/shashank/moviedb/data/remote/MovieRepositoryImpl.java
rename to app/src/main/java/com/shashank/moviedb/data/MovieRepositoryImpl.java
index f2306f3..e1fe321 100644
--- a/app/src/main/java/com/shashank/moviedb/data/remote/MovieRepositoryImpl.java
+++ b/app/src/main/java/com/shashank/moviedb/data/MovieRepositoryImpl.java
@@ -1,4 +1,4 @@
-package com.shashank.moviedb.data.remote;
+package com.shashank.moviedb.data;
 
 import static com.shashank.moviedb.util.Constants.*;
 import static com.shashank.moviedb.util.Constants.TRENDING_TIME_WINDOW;
@@ -7,10 +7,9 @@
 
 import androidx.annotation.NonNull;
 
-import com.shashank.moviedb.data.ResourceCallback;
-import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.local.MovieDao;
 import com.shashank.moviedb.data.local.entity.FavouriteMovieIdsEntity;
+import com.shashank.moviedb.data.remote.MovieApi;
 import com.shashank.moviedb.model.MovieDetail;
 import com.shashank.moviedb.model.MovieResponse;
 import com.shashank.moviedb.model.MovieResult;
diff --git a/app/src/main/java/com/shashank/moviedb/di/AppModule.java b/app/src/main/java/com/shashank/moviedb/di/AppModule.java
index c96e6e2..d076de1 100644
--- a/app/src/main/java/com/shashank/moviedb/di/AppModule.java
+++ b/app/src/main/java/com/shashank/moviedb/di/AppModule.java
@@ -12,8 +12,8 @@
 import com.shashank.moviedb.data.local.MovieDao;
 import com.shashank.moviedb.data.local.MovieDatabase;
 import com.shashank.moviedb.data.remote.MovieApi;
-import com.shashank.moviedb.data.remote.MovieRepository;
-import com.shashank.moviedb.data.remote.MovieRepositoryImpl;
+import com.shashank.moviedb.data.MovieRepository;
+import com.shashank.moviedb.data.MovieRepositoryImpl;
 import com.shashank.moviedb.util.Constants;
 
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/com/shashank/moviedb/ui/HomeActivity.java b/app/src/main/java/com/shashank/moviedb/ui/HomeActivity.java
index 50ff7d3..79048ff 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/HomeActivity.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/HomeActivity.java
@@ -1,31 +1,23 @@
 package com.shashank.moviedb.ui;
 
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.navigation.NavController;
 import androidx.navigation.NavDestination;
-import androidx.navigation.NavOptions;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.NavigationUI;
 import androidx.navigation.ui.AppBarConfiguration;
 
 import com.google.android.material.navigation.NavigationView;
 import com.shashank.moviedb.R;
-import com.shashank.moviedb.data.remote.MovieRepository;
-
-import java.util.HashSet;
+import com.shashank.moviedb.data.MovieRepository;
 
 import javax.inject.Inject;
 
diff --git a/app/src/main/java/com/shashank/moviedb/ui/detail/DetailViewModel.java b/app/src/main/java/com/shashank/moviedb/ui/detail/DetailViewModel.java
index ff47f35..02409fb 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/detail/DetailViewModel.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/detail/DetailViewModel.java
@@ -9,7 +9,7 @@
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.ResourceCallback;
 import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieDetail;
 import com.shashank.moviedb.model.MovieResult;
 
diff --git a/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteFragment.java b/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteFragment.java
index 955022b..63f6147 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteFragment.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteFragment.java
@@ -19,7 +19,7 @@
 import com.shashank.moviedb.common.ViewModelProviderFactory;
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieResult;
 import com.shashank.moviedb.ui.trending.adapter.MovieRecyclerAdapter;
 import com.shashank.moviedb.view.customview.EmptyView;
diff --git a/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteViewModel.java b/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteViewModel.java
index 92aff78..eb80862 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteViewModel.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/favourites/FavouriteViewModel.java
@@ -7,7 +7,7 @@
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.ResourceCallback;
 import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieResult;
 
 import java.util.List;
diff --git a/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingFragment.java b/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingFragment.java
index 1e32de4..9234287 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingFragment.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingFragment.java
@@ -21,7 +21,7 @@
 import com.shashank.moviedb.common.ViewModelProviderFactory;
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieResult;
 import com.shashank.moviedb.ui.trending.adapter.MovieRecyclerAdapter;
 import com.shashank.moviedb.view.customview.EmptyView;
diff --git a/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingViewModel.java b/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingViewModel.java
index 0ac6702..9f818d3 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingViewModel.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/nowplaying/NowPlayingViewModel.java
@@ -1,16 +1,12 @@
 package com.shashank.moviedb.ui.nowplaying;
 
-import android.util.Log;
-
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.ResourceCallback;
-import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
-import com.shashank.moviedb.model.MovieResponse;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieResult;
 import com.shashank.moviedb.util.Constants;
 
diff --git a/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingFragment.java b/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingFragment.java
index 23677b4..0a4ad9b 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingFragment.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingFragment.java
@@ -24,7 +24,7 @@
 import com.shashank.moviedb.common.ViewModelProviderFactory;
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieResult;
 import com.shashank.moviedb.ui.trending.TrendingFragmentDirections.ActionNavTrendingToDetailFragment;
 import com.shashank.moviedb.ui.trending.adapter.MovieRecyclerAdapter;
diff --git a/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingViewModel.java b/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingViewModel.java
index fcaf66b..e21bab7 100644
--- a/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingViewModel.java
+++ b/app/src/main/java/com/shashank/moviedb/ui/trending/TrendingViewModel.java
@@ -8,11 +8,8 @@
 
 import com.shashank.moviedb.data.Resource;
 import com.shashank.moviedb.data.ResourceCallback;
-import com.shashank.moviedb.data.Status;
-import com.shashank.moviedb.data.remote.MovieRepository;
-import com.shashank.moviedb.model.MovieResponse;
+import com.shashank.moviedb.data.MovieRepository;
 import com.shashank.moviedb.model.MovieResult;
-import com.shashank.moviedb.util.Constants;
 
 import java.util.List;