diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db74da2..36749ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-        <activity android:name=".browse.LayoutBrowseActivity">
+        <activity android:name="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -20,20 +20,20 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".layoutpreview.LayoutPreviewBaseActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutVisibilityGoneActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutChainStyleActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutGuidelineBarrierActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
         <activity
-            android:name=".layoutpreview.LayoutGuidelineGroupActivity"
-            android:parentActivityName=".browse.LayoutBrowseActivity" />
+            android:name="com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity"
+            android:parentActivityName="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt b/app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt
index 469fd72..5e5ef11 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/base/DemoApplication.kt
@@ -19,7 +19,7 @@ package com.hossainkhan.android.demo.base
 import android.app.Activity
 import android.app.Application
 import com.hossainkhan.android.demo.BuildConfig
-import com.hossainkhan.android.demo.dagger.DaggerDemoApplicationComponent
+import com.hossainkhan.android.demo.di.DaggerDemoApplicationComponent
 import com.squareup.leakcanary.LeakCanary
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityBindingModule.kt b/app/src/main/java/com/hossainkhan/android/demo/di/ActivityBindingModule.kt
similarity index 84%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityBindingModule.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/ActivityBindingModule.kt
index 798ca6d..0ff5138 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityBindingModule.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/ActivityBindingModule.kt
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
-import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityScope.kt b/app/src/main/java/com/hossainkhan/android/demo/di/ActivityScope.kt
similarity index 94%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityScope.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/ActivityScope.kt
index 8f21dab..c5eee14 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/ActivityScope.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/ActivityScope.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import javax.inject.Scope
 
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/ApplicationModule.kt b/app/src/main/java/com/hossainkhan/android/demo/di/ApplicationModule.kt
similarity index 96%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/ApplicationModule.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/ApplicationModule.kt
index c9f34a3..f702a1b 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/ApplicationModule.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/ApplicationModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.app.Application
 import android.content.Context
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/DataStoreModule.kt b/app/src/main/java/com/hossainkhan/android/demo/di/DataStoreModule.kt
similarity index 96%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/DataStoreModule.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/DataStoreModule.kt
index 7d4df61..5b0371d 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/DataStoreModule.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/DataStoreModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/DemoApplicationComponent.kt b/app/src/main/java/com/hossainkhan/android/demo/di/DemoApplicationComponent.kt
similarity index 97%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/DemoApplicationComponent.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/DemoApplicationComponent.kt
index 42cb22f..89a69d5 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/DemoApplicationComponent.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/DemoApplicationComponent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.app.Application
 import com.hossainkhan.android.demo.base.DemoApplication
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseActivityModule.kt b/app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseActivityModule.kt
similarity index 91%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseActivityModule.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseActivityModule.kt
index 01a0ffa..3778abb 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseActivityModule.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseActivityModule.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.app.Activity
-import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity
 import dagger.Binds
 import dagger.Module
 import dagger.android.ActivityKey
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseSubcomponent.kt b/app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseSubcomponent.kt
similarity index 88%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseSubcomponent.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseSubcomponent.kt
index 9b57388..0438978 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/LayoutBrowseSubcomponent.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/LayoutBrowseSubcomponent.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
-import com.hossainkhan.android.demo.browse.LayoutBrowseActivity
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity
 import dagger.Subcomponent
 import dagger.android.AndroidInjector
 
diff --git a/app/src/main/java/com/hossainkhan/android/demo/dagger/NavigatorModule.kt b/app/src/main/java/com/hossainkhan/android/demo/di/NavigatorModule.kt
similarity index 82%
rename from app/src/main/java/com/hossainkhan/android/demo/dagger/NavigatorModule.kt
rename to app/src/main/java/com/hossainkhan/android/demo/di/NavigatorModule.kt
index 84ef7ee..11c95c8 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/dagger/NavigatorModule.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/di/NavigatorModule.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.dagger
+package com.hossainkhan.android.demo.di
 
 import android.content.Context
-import com.hossainkhan.android.demo.browse.DefaultLayoutBrowseNavigator
-import com.hossainkhan.android.demo.browse.LayoutBrowseNavigator
+import com.hossainkhan.android.demo.ui.browse.DefaultLayoutBrowseNavigator
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseNavigator
 import dagger.Module
 import dagger.Provides
 
diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/DefaultLayoutBrowseNavigator.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/DefaultLayoutBrowseNavigator.kt
similarity index 93%
rename from app/src/main/java/com/hossainkhan/android/demo/browse/DefaultLayoutBrowseNavigator.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/browse/DefaultLayoutBrowseNavigator.kt
index 49de004..592c235 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/browse/DefaultLayoutBrowseNavigator.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/DefaultLayoutBrowseNavigator.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import android.content.Context
 import android.content.Intent
-import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity
 import javax.inject.Inject
 
 class DefaultLayoutBrowseNavigator @Inject constructor(private val context: Context) : LayoutBrowseNavigator {
diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseActivity.kt
similarity index 98%
rename from app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseActivity.kt
index 48a8ee5..6e37f74 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseAdapter.kt
similarity index 98%
rename from app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseAdapter.kt
index 6115e16..a359f49 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.Observer
diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseNavigator.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseNavigator.kt
similarity index 94%
rename from app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseNavigator.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseNavigator.kt
index e7e7c49..936e7e8 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseNavigator.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseNavigator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import androidx.annotation.LayoutRes
 
diff --git a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModel.kt
similarity index 87%
rename from app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModel.kt
index 6656f32..53e3918 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -22,10 +22,10 @@ import androidx.lifecycle.ViewModel
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.data.LayoutInformation
-import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
 import timber.log.Timber
 
 class LayoutBrowseViewModel(
diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutChainStyleActivity.kt
similarity index 98%
rename from app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutChainStyleActivity.kt
index 0fd943b..8c61887 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutChainStyleActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineBarrierActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineBarrierActivity.kt
similarity index 96%
rename from app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineBarrierActivity.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineBarrierActivity.kt
index 2ce5d44..719294f 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineBarrierActivity.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineBarrierActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.widget.Button
diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineGroupActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineGroupActivity.kt
similarity index 96%
rename from app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineGroupActivity.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineGroupActivity.kt
index ec05c81..559b30d 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutGuidelineGroupActivity.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutGuidelineGroupActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModel.kt
similarity index 97%
rename from app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModel.kt
index 99ff06a..9cab1c4 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutPreviewBaseActivity.kt
similarity index 99%
rename from app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutPreviewBaseActivity.kt
index 39c6639..060f356 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutPreviewBaseActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutVisibilityGoneActivity.kt b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutVisibilityGoneActivity.kt
similarity index 96%
rename from app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutVisibilityGoneActivity.kt
rename to app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutVisibilityGoneActivity.kt
index 8e6ef32..99663a0 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutVisibilityGoneActivity.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutVisibilityGoneActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt b/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt
index 7eec229..3edad48 100644
--- a/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt
+++ b/app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt
@@ -18,10 +18,10 @@ package com.hossainkhan.android.demo.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.hossainkhan.android.demo.browse.LayoutBrowseNavigator
-import com.hossainkhan.android.demo.browse.LayoutBrowseViewModel
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseNavigator
+import com.hossainkhan.android.demo.ui.browse.LayoutBrowseViewModel
 import com.hossainkhan.android.demo.data.AppDataStore
-import com.hossainkhan.android.demo.layoutpreview.LayoutInfoViewModel
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutInfoViewModel
 import javax.inject.Inject
 
 /**
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 01663a2..9838095 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.hossainkhan.android.demo.browse.LayoutBrowseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.browse.LayoutBrowseActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
diff --git a/app/src/main/res/layout/preview_dimension_percent.xml b/app/src/main/res/layout/preview_dimension_percent.xml
index f29f5f2..abcd624 100644
--- a/app/src/main/res/layout/preview_dimension_percent.xml
+++ b/app/src/main/res/layout/preview_dimension_percent.xml
@@ -23,7 +23,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--
diff --git a/app/src/main/res/layout/preview_dimension_ratio.xml b/app/src/main/res/layout/preview_dimension_ratio.xml
index ef6dec8..074b23a 100644
--- a/app/src/main/res/layout/preview_dimension_ratio.xml
+++ b/app/src/main/res/layout/preview_dimension_ratio.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--
diff --git a/app/src/main/res/layout/preview_positioning_bias.xml b/app/src/main/res/layout/preview_positioning_bias.xml
index e821aaf..a3d1e61 100644
--- a/app/src/main/res/layout/preview_positioning_bias.xml
+++ b/app/src/main/res/layout/preview_positioning_bias.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
     <!--
         1st view that is horizontally biased towards the bottom using 85% bias
diff --git a/app/src/main/res/layout/preview_positioning_centered.xml b/app/src/main/res/layout/preview_positioning_centered.xml
index 3597320..7764352 100644
--- a/app/src/main/res/layout/preview_positioning_centered.xml
+++ b/app/src/main/res/layout/preview_positioning_centered.xml
@@ -22,7 +22,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--
diff --git a/app/src/main/res/layout/preview_positioning_top_left.xml b/app/src/main/res/layout/preview_positioning_top_left.xml
index 192aa25..6d380a8 100644
--- a/app/src/main/res/layout/preview_positioning_top_left.xml
+++ b/app/src/main/res/layout/preview_positioning_top_left.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:foreground="@drawable/ic_grid_overlay"
     android:foregroundTint="@color/grid_tint"
-    tools:context=".layoutpreview.LayoutPreviewBaseActivity">
+    tools:context="com.hossainkhan.android.demo.ui.layoutpreview.LayoutPreviewBaseActivity">
 
 
     <!--
diff --git a/app/src/test/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModelTest.kt b/app/src/test/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModelTest.kt
similarity index 90%
rename from app/src/test/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModelTest.kt
rename to app/src/test/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModelTest.kt
index 822fc0c..5febe91 100644
--- a/app/src/test/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModelTest.kt
+++ b/app/src/test/java/com/hossainkhan/android/demo/ui/browse/LayoutBrowseViewModelTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.browse
+package com.hossainkhan.android.demo.ui.browse
 
 import android.content.SharedPreferences
 import android.content.res.Resources
@@ -22,10 +22,10 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.hossainkhan.android.demo.R
 import com.hossainkhan.android.demo.data.AppDataStore
 import com.hossainkhan.android.demo.data.LayoutDataStore
-import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineBarrierActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutGuidelineGroupActivity
-import com.hossainkhan.android.demo.layoutpreview.LayoutVisibilityGoneActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutChainStyleActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineBarrierActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutGuidelineGroupActivity
+import com.hossainkhan.android.demo.ui.layoutpreview.LayoutVisibilityGoneActivity
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/test/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModelTest.kt b/app/src/test/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModelTest.kt
similarity index 97%
rename from app/src/test/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModelTest.kt
rename to app/src/test/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModelTest.kt
index 7186e4f..6faef68 100644
--- a/app/src/test/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModelTest.kt
+++ b/app/src/test/java/com/hossainkhan/android/demo/ui/layoutpreview/LayoutInfoViewModelTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hossainkhan.android.demo.layoutpreview
+package com.hossainkhan.android.demo.ui.layoutpreview
 
 import android.content.SharedPreferences
 import android.content.res.Resources