diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 058d165b..23c638a7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -81,7 +81,7 @@
             android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
             android:theme="@style/Base.Theme.AppCompat" />
 
-        <receiver android:name=".util.NotificationClearBroadcastReceiver" />
+        <receiver android:name=".receiver.NotificationClearBroadcastReceiver" />
 
         <service
             tools:targetApi="24"
diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
index ae6f99ac..bf03004f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
@@ -52,7 +52,7 @@ import com.keylesspalace.tusky.pager.AccountPagerAdapter;
 import com.keylesspalace.tusky.util.LinkHelper;
 import com.keylesspalace.tusky.util.Assert;
 import com.keylesspalace.tusky.util.Log;
-import com.keylesspalace.tusky.util.TimelineReceiver;
+import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.pkmmte.view.CircularImageView;
 import com.squareup.picasso.Picasso;
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 17e9b726..daff45e5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -38,9 +38,9 @@ import com.keylesspalace.tusky.adapter.TimelineAdapter;
 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.TimelineReceiver;
+import com.keylesspalace.tusky.receiver.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
 import java.util.Iterator;
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationClearBroadcastReceiver.java b/app/src/main/java/com/keylesspalace/tusky/receiver/NotificationClearBroadcastReceiver.java
similarity index 96%
rename from app/src/main/java/com/keylesspalace/tusky/util/NotificationClearBroadcastReceiver.java
rename to app/src/main/java/com/keylesspalace/tusky/receiver/NotificationClearBroadcastReceiver.java
index d18902e3..b80cb5fa 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationClearBroadcastReceiver.java
+++ b/app/src/main/java/com/keylesspalace/tusky/receiver/NotificationClearBroadcastReceiver.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.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/TimelineReceiver.java b/app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java
similarity index 96%
rename from app/src/main/java/com/keylesspalace/tusky/util/TimelineReceiver.java
rename to app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java
index f6acc0d9..71a09413 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/TimelineReceiver.java
+++ b/app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java
@@ -1,4 +1,4 @@
-package com.keylesspalace.tusky.util;
+package com.keylesspalace.tusky.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java b/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java
index e5bc7003..22947dc0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java
+++ b/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java
@@ -32,6 +32,8 @@ import android.support.v4.app.TaskStackBuilder;
 import com.keylesspalace.tusky.MainActivity;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.entity.Notification;
+import com.keylesspalace.tusky.receiver.NotificationClearBroadcastReceiver;
+import com.keylesspalace.tusky.view.RoundedTransformation;
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;