diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e461f833..665f0993 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".view.MainActivity"
+            android:name=".controller.MainActivity"
             android:launchMode="singleTask"
             android:label="@string/app_name" />
         <activity
diff --git a/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java b/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java
index ec1908d8..d19d31ec 100644
--- a/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java
+++ b/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java
@@ -1,8 +1,8 @@
 package com.mapzen.erasermap;
 
+import com.mapzen.erasermap.controller.MainActivity;
 import com.mapzen.erasermap.view.DistanceView;
 import com.mapzen.erasermap.view.InitActivity;
-import com.mapzen.erasermap.view.MainActivity;
 import com.mapzen.erasermap.view.RouteModeView;
 import com.mapzen.erasermap.view.SearchResultsAdapter;
 import com.mapzen.erasermap.view.SettingsActivity;
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/MainActivity.kt b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt
similarity index 98%
rename from app/src/main/kotlin/com/mapzen/erasermap/view/MainActivity.kt
rename to app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt
index e2b95d04..af9ee285 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/view/MainActivity.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.mapzen.erasermap.view
+package com.mapzen.erasermap.controller
 
 import android.content.Intent
 import android.content.SharedPreferences
@@ -35,6 +35,16 @@ import com.mapzen.erasermap.util.AxisAlignedBoundingBox
 import com.mapzen.erasermap.util.AxisAlignedBoundingBox.PointD
 import com.mapzen.erasermap.util.NotificationBroadcastReceiver
 import com.mapzen.erasermap.util.NotificationCreator
+import com.mapzen.erasermap.view.CompassView
+import com.mapzen.erasermap.view.InstructionListActivity
+import com.mapzen.erasermap.view.MuteView
+import com.mapzen.erasermap.view.RouteModeView
+import com.mapzen.erasermap.view.RoutePreviewView
+import com.mapzen.erasermap.view.SearchListViewAdapter
+import com.mapzen.erasermap.view.SearchResultsAdapter
+import com.mapzen.erasermap.view.SearchResultsView
+import com.mapzen.erasermap.view.SettingsActivity
+import com.mapzen.erasermap.view.VoiceNavigationController
 import com.mapzen.pelias.Pelias
 import com.mapzen.pelias.SavedSearch
 import com.mapzen.pelias.SimpleFeature
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/MainViewController.kt b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainViewController.kt
similarity index 96%
rename from app/src/main/kotlin/com/mapzen/erasermap/view/MainViewController.kt
rename to app/src/main/kotlin/com/mapzen/erasermap/controller/MainViewController.kt
index 54e96859..831c6421 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/view/MainViewController.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainViewController.kt
@@ -1,7 +1,6 @@
-package com.mapzen.erasermap.view
+package com.mapzen.erasermap.controller
 
 import android.location.Location
-import android.view.MotionEvent
 import com.mapzen.pelias.gson.Feature
 import com.mapzen.valhalla.Route
 
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenter.kt b/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenter.kt
index 2de108d0..15555d8c 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenter.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenter.kt
@@ -1,7 +1,7 @@
 package com.mapzen.erasermap.presenter
 
 import android.location.Location
-import com.mapzen.erasermap.view.MainViewController
+import com.mapzen.erasermap.controller.MainViewController
 import com.mapzen.erasermap.view.RouteViewController
 import com.mapzen.pelias.PeliasLocationProvider
 import com.mapzen.pelias.gson.Feature
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenterImpl.kt b/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenterImpl.kt
index 35ac583e..36da1f77 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenterImpl.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/presenter/MainPresenterImpl.kt
@@ -15,7 +15,7 @@ import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.ROUTE_PREVIEW
 import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.ROUTING
 import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.SEARCH
 import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.SEARCH_RESULTS
-import com.mapzen.erasermap.view.MainViewController
+import com.mapzen.erasermap.controller.MainViewController
 import com.mapzen.erasermap.view.RouteViewController
 import com.mapzen.pelias.PeliasLocationProvider
 import com.mapzen.pelias.gson.Feature
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationBroadcastReceiver.kt b/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationBroadcastReceiver.kt
index bd9ef2c5..8092bf93 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationBroadcastReceiver.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationBroadcastReceiver.kt
@@ -6,7 +6,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.mapzen.erasermap.EraserMapApplication
-import com.mapzen.erasermap.view.MainActivity
+import com.mapzen.erasermap.controller.MainActivity
 
 public class NotificationBroadcastReceiver : BroadcastReceiver() {
 
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationCreator.kt b/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationCreator.kt
index 9fbd53d0..3c17ab54 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationCreator.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/util/NotificationCreator.kt
@@ -14,7 +14,7 @@ import android.support.v4.app.NotificationCompat
 import android.support.v4.app.TaskStackBuilder
 import com.mapzen.erasermap.R
 import com.mapzen.erasermap.service.NotificationService
-import com.mapzen.erasermap.view.MainActivity
+import com.mapzen.erasermap.controller.MainActivity
 
 public class NotificationCreator(private val mainActivity: Activity) {
     private var builder: NotificationCompat.Builder? = null
diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/InitActivity.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/InitActivity.kt
index c0e26f12..8a98f98b 100644
--- a/app/src/main/kotlin/com/mapzen/erasermap/view/InitActivity.kt
+++ b/app/src/main/kotlin/com/mapzen/erasermap/view/InitActivity.kt
@@ -10,6 +10,7 @@ import com.mapzen.erasermap.BuildConfig
 import com.mapzen.erasermap.CrashReportService
 import com.mapzen.erasermap.EraserMapApplication
 import com.mapzen.erasermap.R
+import com.mapzen.erasermap.controller.MainActivity
 import com.mapzen.erasermap.model.ApiKeys
 import com.mapzen.erasermap.model.SimpleCrypt
 import javax.inject.Inject
diff --git a/app/src/test/java/com/mapzen/erasermap/view/InitActivityTest.kt b/app/src/test/java/com/mapzen/erasermap/view/InitActivityTest.kt
index 828f3510..b04f1989 100644
--- a/app/src/test/java/com/mapzen/erasermap/view/InitActivityTest.kt
+++ b/app/src/test/java/com/mapzen/erasermap/view/InitActivityTest.kt
@@ -2,6 +2,7 @@ package com.mapzen.erasermap.view
 
 import com.mapzen.erasermap.BuildConfig
 import com.mapzen.erasermap.PrivateMapsTestRunner
+import com.mapzen.erasermap.controller.MainActivity
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/com/mapzen/erasermap/view/InstructionListActivityTest.java b/app/src/test/java/com/mapzen/erasermap/view/InstructionListActivityTest.java
index e9030a0e..18dde631 100644
--- a/app/src/test/java/com/mapzen/erasermap/view/InstructionListActivityTest.java
+++ b/app/src/test/java/com/mapzen/erasermap/view/InstructionListActivityTest.java
@@ -1,15 +1,9 @@
 package com.mapzen.erasermap.view;
 
-import android.content.Intent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
 import com.mapzen.erasermap.BuildConfig;
 import com.mapzen.erasermap.PrivateMapsTestRunner;
 import com.mapzen.erasermap.R;
+import com.mapzen.erasermap.controller.MainActivity;
 import com.mapzen.pelias.SimpleFeature;
 import com.mapzen.valhalla.Route;
 
@@ -21,6 +15,13 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 
+import android.content.Intent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
 import static com.mapzen.erasermap.dummy.TestHelper.getFixture;
 import static com.mapzen.erasermap.dummy.TestHelper.getTestFeature;
 import static com.mapzen.erasermap.dummy.TestHelper.getTestLocation;
diff --git a/app/src/test/java/com/mapzen/erasermap/view/RouteModeViewTest.java b/app/src/test/java/com/mapzen/erasermap/view/RouteModeViewTest.java
index b525a3c3..cb16e2d6 100644
--- a/app/src/test/java/com/mapzen/erasermap/view/RouteModeViewTest.java
+++ b/app/src/test/java/com/mapzen/erasermap/view/RouteModeViewTest.java
@@ -3,6 +3,7 @@
 import com.mapzen.erasermap.BuildConfig;
 import com.mapzen.erasermap.PrivateMapsTestRunner;
 import com.mapzen.erasermap.R;
+import com.mapzen.erasermap.controller.MainActivity;
 import com.mapzen.erasermap.dummy.TestHelper;
 import com.mapzen.erasermap.presenter.MainPresenter;
 import com.mapzen.erasermap.presenter.MainPresenterImpl;
diff --git a/app/src/test/java/com/mapzen/erasermap/view/MainActivityTest.kt b/app/src/test/kotlin/com/mapzen/erasermap/controller/MainActivityTest.kt
similarity index 99%
rename from app/src/test/java/com/mapzen/erasermap/view/MainActivityTest.kt
rename to app/src/test/kotlin/com/mapzen/erasermap/controller/MainActivityTest.kt
index e6ce0e85..32b6d7a0 100644
--- a/app/src/test/java/com/mapzen/erasermap/view/MainActivityTest.kt
+++ b/app/src/test/kotlin/com/mapzen/erasermap/controller/MainActivityTest.kt
@@ -1,4 +1,4 @@
-package com.mapzen.erasermap.view
+package com.mapzen.erasermap.controller
 
 import android.content.ComponentName
 import android.content.Context.LOCATION_SERVICE
@@ -22,6 +22,7 @@ import com.mapzen.erasermap.dummy.TestHelper.getTestLocation
 import com.mapzen.erasermap.presenter.MainPresenter
 import com.mapzen.erasermap.shadows.ShadowMapData
 import com.mapzen.erasermap.shadows.ShadowTangram
+import com.mapzen.erasermap.view.RouteModeView
 import com.mapzen.pelias.SavedSearch
 import com.mapzen.pelias.gson.Feature
 import com.mapzen.tangram.LngLat
diff --git a/app/src/test/kotlin/com/mapzen/erasermap/view/TestMainController.kt b/app/src/test/kotlin/com/mapzen/erasermap/controller/TestMainController.kt
similarity index 99%
rename from app/src/test/kotlin/com/mapzen/erasermap/view/TestMainController.kt
rename to app/src/test/kotlin/com/mapzen/erasermap/controller/TestMainController.kt
index 35773b4e..b7a398f7 100644
--- a/app/src/test/kotlin/com/mapzen/erasermap/view/TestMainController.kt
+++ b/app/src/test/kotlin/com/mapzen/erasermap/controller/TestMainController.kt
@@ -1,7 +1,7 @@
-package com.mapzen.erasermap.view
+package com.mapzen.erasermap.controller
 
-import android.location.Location
 import android.graphics.PointF
+import android.location.Location
 import com.mapzen.pelias.gson.Feature
 import com.mapzen.valhalla.Route
 
diff --git a/app/src/test/kotlin/com/mapzen/erasermap/presenter/MainPresenterTest.kt b/app/src/test/kotlin/com/mapzen/erasermap/presenter/MainPresenterTest.kt
index eacaf82b..7979ed41 100644
--- a/app/src/test/kotlin/com/mapzen/erasermap/presenter/MainPresenterTest.kt
+++ b/app/src/test/kotlin/com/mapzen/erasermap/presenter/MainPresenterTest.kt
@@ -15,7 +15,7 @@ import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.ROUTE_DIRECTION
 import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.ROUTE_PREVIEW
 import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.ROUTING
 import com.mapzen.erasermap.presenter.ViewStateManager.ViewState.SEARCH_RESULTS
-import com.mapzen.erasermap.view.TestMainController
+import com.mapzen.erasermap.controller.TestMainController
 import com.mapzen.erasermap.view.TestRouteController
 import com.mapzen.pelias.gson.Feature
 import com.mapzen.pelias.gson.Result
diff --git a/circle.yml b/circle.yml
index ef551cde..be3fb41e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -16,7 +16,7 @@ dependencies:
 
 test:
   override:
-    - case $CIRCLE_NODE_INDEX in 0) ./gradlew testDevDebug --tests='*.model.*' $TEST_OPTS ;; 1) ./gradlew testDevDebug --tests='*.view.*' $TEST_OPTS ;; 2) ./gradlew testDevDebug --tests='*.presenter.*' $TEST_OPTS ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) ./gradlew testDevDebug --tests='*.model.*' $TEST_OPTS ;; 1) ./gradlew testDevDebug --tests='*.view.*' $TEST_OPTS ;; 2) ./gradlew testDevDebug --tests='*.presenter.*' $TEST_OPTS ;; 3) ./gradlew testDevDebug --tests='*.controller.*' $TEST_OPTS ;; esac:
         parallel: true
   post:
     - mkdir -p $CIRCLE_TEST_REPORTS/junit