diff --git a/MinimalBible/AndroidManifest.xml b/MinimalBible/AndroidManifest.xml
index 0a13f2b..f42e055 100644
--- a/MinimalBible/AndroidManifest.xml
+++ b/MinimalBible/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="org.bspeice.minimalbible.BibleViewer"
+            android:name="org.bspeice.minimalbible.activities.viewer.BibleViewer"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/MinimalBible/res/layout/activity_bible_viewer.xml b/MinimalBible/res/layout/activity_bible_viewer.xml
index e782a4a..a350125 100644
--- a/MinimalBible/res/layout/activity_bible_viewer.xml
+++ b/MinimalBible/res/layout/activity_bible_viewer.xml
@@ -4,7 +4,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.bspeice.minimalbible.BibleViewer" >
+    tools:context="org.bspeice.minimalbible.activities.viewer.BibleViewer" >
 
     <!--
          As the main content view, the view below consumes the entire
diff --git a/MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java b/MinimalBible/src/org/bspeice/minimalbible/activities/viewer/BibleViewer.java
similarity index 94%
rename from MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java
rename to MinimalBible/src/org/bspeice/minimalbible/activities/viewer/BibleViewer.java
index a8f5601..20627e5 100644
--- a/MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java
+++ b/MinimalBible/src/org/bspeice/minimalbible/activities/viewer/BibleViewer.java
@@ -1,5 +1,10 @@
-package org.bspeice.minimalbible;
+package org.bspeice.minimalbible.activities.viewer;
 
+import org.bspeice.minimalbible.R;
+import org.bspeice.minimalbible.R.id;
+import org.bspeice.minimalbible.R.layout;
+import org.bspeice.minimalbible.R.menu;
+import org.bspeice.minimalbible.R.string;
 import org.bspeice.minimalbible.activities.BaseActivity;
 import org.bspeice.minimalbible.activities.NavigationDrawerFragment;
 import org.bspeice.minimalbible.activities.downloader.DownloadActivity;