diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a66c5de..b73ea7d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".LookingSatApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/rtbishop/lookingsat/Injector.kt b/app/src/main/java/com/rtbishop/lookingsat/Injector.kt
index 53436be3..e9fef9fc 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/Injector.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/Injector.kt
@@ -1,11 +1,11 @@
 package com.rtbishop.lookingsat
 
 import android.content.Context
-import com.rtbishop.lookingsat.api.RemoteDataSource
-import com.rtbishop.lookingsat.api.TransmittersApi
-import com.rtbishop.lookingsat.db.LocalDataSource
-import com.rtbishop.lookingsat.db.TransmittersDatabase
+import com.rtbishop.lookingsat.network.RemoteDataSource
+import com.rtbishop.lookingsat.network.TransmittersApi
 import com.rtbishop.lookingsat.repo.Repository
+import com.rtbishop.lookingsat.storage.LocalDataSource
+import com.rtbishop.lookingsat.storage.TransmittersDatabase
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
diff --git a/app/src/main/java/com/rtbishop/lookingsat/LookingSatApp.kt b/app/src/main/java/com/rtbishop/lookingsat/LookingSatApp.kt
new file mode 100644
index 00000000..9988bc3c
--- /dev/null
+++ b/app/src/main/java/com/rtbishop/lookingsat/LookingSatApp.kt
@@ -0,0 +1,12 @@
+package com.rtbishop.lookingsat
+
+import android.app.Application
+import com.rtbishop.lookingsat.di.AppComponent
+import com.rtbishop.lookingsat.di.DaggerAppComponent
+
+class LookingSatApp : Application() {
+
+    val appComponent: AppComponent by lazy {
+        DaggerAppComponent.factory().create(applicationContext)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/lookingsat/di/AppComponent.kt b/app/src/main/java/com/rtbishop/lookingsat/di/AppComponent.kt
new file mode 100644
index 00000000..be36844e
--- /dev/null
+++ b/app/src/main/java/com/rtbishop/lookingsat/di/AppComponent.kt
@@ -0,0 +1,19 @@
+package com.rtbishop.lookingsat.di
+
+import android.content.Context
+import com.rtbishop.lookingsat.ui.MainActivity
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [NetworkModule::class, StorageModule::class])
+interface AppComponent {
+
+    @Component.Factory
+    interface Factory {
+        fun create(@BindsInstance context: Context): AppComponent
+    }
+
+    fun inject(activity: MainActivity)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/lookingsat/di/NetworkModule.kt b/app/src/main/java/com/rtbishop/lookingsat/di/NetworkModule.kt
new file mode 100644
index 00000000..c60f1c92
--- /dev/null
+++ b/app/src/main/java/com/rtbishop/lookingsat/di/NetworkModule.kt
@@ -0,0 +1,6 @@
+package com.rtbishop.lookingsat.di
+
+import dagger.Module
+
+@Module
+class NetworkModule
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/lookingsat/di/StorageModule.kt b/app/src/main/java/com/rtbishop/lookingsat/di/StorageModule.kt
new file mode 100644
index 00000000..897c0052
--- /dev/null
+++ b/app/src/main/java/com/rtbishop/lookingsat/di/StorageModule.kt
@@ -0,0 +1,6 @@
+package com.rtbishop.lookingsat.di
+
+import dagger.Module
+
+@Module
+class StorageModule
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/lookingsat/api/RemoteDataSource.kt b/app/src/main/java/com/rtbishop/lookingsat/network/RemoteDataSource.kt
similarity index 95%
rename from app/src/main/java/com/rtbishop/lookingsat/api/RemoteDataSource.kt
rename to app/src/main/java/com/rtbishop/lookingsat/network/RemoteDataSource.kt
index 45299577..f28e0bc5 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/api/RemoteDataSource.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/network/RemoteDataSource.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.lookingsat.api
+package com.rtbishop.lookingsat.network
 
 import com.rtbishop.lookingsat.repo.Transmitter
 import okhttp3.OkHttpClient
diff --git a/app/src/main/java/com/rtbishop/lookingsat/api/TransmittersApi.kt b/app/src/main/java/com/rtbishop/lookingsat/network/TransmittersApi.kt
similarity index 82%
rename from app/src/main/java/com/rtbishop/lookingsat/api/TransmittersApi.kt
rename to app/src/main/java/com/rtbishop/lookingsat/network/TransmittersApi.kt
index 0d904b66..3bc5ec49 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/api/TransmittersApi.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/network/TransmittersApi.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.lookingsat.api
+package com.rtbishop.lookingsat.network
 
 import com.rtbishop.lookingsat.repo.Transmitter
 import retrofit2.http.GET
diff --git a/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt b/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt
index d3e258bf..1fc56649 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt
@@ -1,7 +1,7 @@
 package com.rtbishop.lookingsat.repo
 
-import com.rtbishop.lookingsat.api.RemoteDataSource
-import com.rtbishop.lookingsat.db.LocalDataSource
+import com.rtbishop.lookingsat.network.RemoteDataSource
+import com.rtbishop.lookingsat.storage.LocalDataSource
 import java.io.InputStream
 
 class Repository(
diff --git a/app/src/main/java/com/rtbishop/lookingsat/repo/Transmitter.kt b/app/src/main/java/com/rtbishop/lookingsat/repo/Transmitter.kt
index cc27e30d..3e3f996e 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/repo/Transmitter.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/repo/Transmitter.kt
@@ -16,4 +16,4 @@ data class Transmitter(
     @SerializedName("mode") val mode: String?,
     @SerializedName("invert") val isInverted: Boolean,
     @SerializedName("norad_cat_id") val noradCatId: Int
-)
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/rtbishop/lookingsat/db/LocalDataSource.kt b/app/src/main/java/com/rtbishop/lookingsat/storage/LocalDataSource.kt
similarity index 90%
rename from app/src/main/java/com/rtbishop/lookingsat/db/LocalDataSource.kt
rename to app/src/main/java/com/rtbishop/lookingsat/storage/LocalDataSource.kt
index 380b4bcc..87148a97 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/db/LocalDataSource.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/storage/LocalDataSource.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.lookingsat.db
+package com.rtbishop.lookingsat.storage
 
 import com.rtbishop.lookingsat.repo.Transmitter
 
diff --git a/app/src/main/java/com/rtbishop/lookingsat/db/TransmittersDao.kt b/app/src/main/java/com/rtbishop/lookingsat/storage/TransmittersDao.kt
similarity index 92%
rename from app/src/main/java/com/rtbishop/lookingsat/db/TransmittersDao.kt
rename to app/src/main/java/com/rtbishop/lookingsat/storage/TransmittersDao.kt
index 28afabe2..8c4a822c 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/db/TransmittersDao.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/storage/TransmittersDao.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.lookingsat.db
+package com.rtbishop.lookingsat.storage
 
 import androidx.room.Dao
 import androidx.room.Insert
diff --git a/app/src/main/java/com/rtbishop/lookingsat/db/TransmittersDatabase.kt b/app/src/main/java/com/rtbishop/lookingsat/storage/TransmittersDatabase.kt
similarity index 95%
rename from app/src/main/java/com/rtbishop/lookingsat/db/TransmittersDatabase.kt
rename to app/src/main/java/com/rtbishop/lookingsat/storage/TransmittersDatabase.kt
index fce8707d..2b8755b0 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/db/TransmittersDatabase.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/storage/TransmittersDatabase.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.lookingsat.db
+package com.rtbishop.lookingsat.storage
 
 import android.content.Context
 import androidx.room.Database