diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index f0089fd2..f1e3eb34 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -73,7 +73,7 @@ import com.keylesspalace.tusky.entity.Media;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.fragment.ComposeOptionsFragment;
 import com.keylesspalace.tusky.util.DownsizeImageTask;
-import com.keylesspalace.tusky.util.EditTextTyped;
+import com.keylesspalace.tusky.view.EditTextTyped;
 import com.keylesspalace.tusky.util.CountUpDownLatch;
 import com.keylesspalace.tusky.util.IOUtils;
 import com.keylesspalace.tusky.util.Log;
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
index 1d029e86..abfecd8e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
@@ -28,7 +28,7 @@ import android.widget.TextView;
 import android.widget.ToggleButton;
 
 import com.keylesspalace.tusky.R;
-import com.keylesspalace.tusky.util.RoundedTransformation;
+import com.keylesspalace.tusky.view.RoundedTransformation;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.util.DateUtils;
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java
index eed0d72a..db12f323 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java
@@ -42,7 +42,7 @@ import com.keylesspalace.tusky.entity.Relationship;
 import com.keylesspalace.tusky.interfaces.AccountActionListener;
 import com.keylesspalace.tusky.network.MastodonAPI;
 import com.keylesspalace.tusky.R;
-import com.keylesspalace.tusky.util.EndlessOnScrollListener;
+import com.keylesspalace.tusky.view.EndlessOnScrollListener;
 import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
index bef04290..cd95b215 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
@@ -39,7 +39,7 @@ import com.keylesspalace.tusky.entity.Notification;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
-import com.keylesspalace.tusky.util.EndlessOnScrollListener;
+import com.keylesspalace.tusky.view.EndlessOnScrollListener;
 import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index d02f4359..32a37142 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -38,7 +38,7 @@ import com.keylesspalace.tusky.network.MastodonAPI;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
-import com.keylesspalace.tusky.util.ConversationLineItemDecoration;
+import com.keylesspalace.tusky.view.ConversationLineItemDecoration;
 import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ConversationLineItemDecoration.java b/app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.java
similarity index 98%
rename from app/src/main/java/com/keylesspalace/tusky/util/ConversationLineItemDecoration.java
rename to app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.java
index dab773c3..fee358d0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/ConversationLineItemDecoration.java
+++ b/app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.java
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util;
+package com.keylesspalace.tusky.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/EditTextTyped.java b/app/src/main/java/com/keylesspalace/tusky/view/EditTextTyped.java
similarity index 96%
rename from app/src/main/java/com/keylesspalace/tusky/util/EditTextTyped.java
rename to app/src/main/java/com/keylesspalace/tusky/view/EditTextTyped.java
index c32f666f..2c8f8521 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/EditTextTyped.java
+++ b/app/src/main/java/com/keylesspalace/tusky/view/EditTextTyped.java
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util;
+package com.keylesspalace.tusky.view;
 
 import android.content.Context;
 import android.support.v13.view.inputmethod.EditorInfoCompat;
@@ -23,6 +23,8 @@ import android.util.AttributeSet;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 
+import com.keylesspalace.tusky.util.Assert;
+
 public class EditTextTyped extends AppCompatEditText {
     InputConnectionCompat.OnCommitContentListener onCommitContentListener;
     String[] mimeTypes;
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/EndlessOnScrollListener.java b/app/src/main/java/com/keylesspalace/tusky/view/EndlessOnScrollListener.java
similarity index 98%
rename from app/src/main/java/com/keylesspalace/tusky/util/EndlessOnScrollListener.java
rename to app/src/main/java/com/keylesspalace/tusky/view/EndlessOnScrollListener.java
index 0b149de0..8b45d11f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/EndlessOnScrollListener.java
+++ b/app/src/main/java/com/keylesspalace/tusky/view/EndlessOnScrollListener.java
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util;
+package com.keylesspalace.tusky.view;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/FlowLayout.java b/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
similarity index 98%
rename from app/src/main/java/com/keylesspalace/tusky/util/FlowLayout.java
rename to app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
index cf1f9e68..df762377 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/FlowLayout.java
+++ b/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util;
+package com.keylesspalace.tusky.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -22,6 +22,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.keylesspalace.tusky.R;
+import com.keylesspalace.tusky.util.Assert;
 
 public class FlowLayout extends ViewGroup {
     private int paddingHorizontal; // internal padding between child views
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/RoundedTransformation.java b/app/src/main/java/com/keylesspalace/tusky/view/RoundedTransformation.java
similarity index 98%
rename from app/src/main/java/com/keylesspalace/tusky/util/RoundedTransformation.java
rename to app/src/main/java/com/keylesspalace/tusky/view/RoundedTransformation.java
index ff153d68..9a023010 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/RoundedTransformation.java
+++ b/app/src/main/java/com/keylesspalace/tusky/view/RoundedTransformation.java
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License along with Tusky; if not,
  * see <http://www.gnu.org/licenses>. */
 
-package com.keylesspalace.tusky.util;
+package com.keylesspalace.tusky.view;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index 0252cce7..1f5b14f1 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -54,7 +54,7 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
 
-            <com.keylesspalace.tusky.util.EditTextTyped
+            <com.keylesspalace.tusky.view.EditTextTyped
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:id="@+id/compose_edit_field"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 077a1552..1287c55f 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -95,7 +95,7 @@
 
     </RelativeLayout>
 
-    <com.keylesspalace.tusky.util.FlowLayout
+    <com.keylesspalace.tusky.view.FlowLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/status_content_warning_bar"
@@ -127,7 +127,7 @@
             android:textAllCaps="true"
             android:background="?attr/content_warning_button" />
 
-    </com.keylesspalace.tusky.util.FlowLayout>
+    </com.keylesspalace.tusky.view.FlowLayout>
 
     <TextView
         android:id="@+id/status_content"