diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index 99be894c..38a14b43 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -45,7 +45,7 @@ import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.Post;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.utils.CustomLinearLayoutManager;
-import gr.thmmy.mthmmy.utils.EmojiKeyboard;
+import gr.thmmy.mthmmy.editorview.EmojiKeyboard;
 import gr.thmmy.mthmmy.utils.HTMLUtils;
 import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import gr.thmmy.mthmmy.viewmodel.TopicViewModel;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index c7b77901..2b06ffa9 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -15,7 +15,6 @@ import android.support.annotation.NonNull;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.content.res.AppCompatResources;
-import android.support.v7.widget.AppCompatImageButton;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -47,8 +46,8 @@ import gr.thmmy.mthmmy.model.Post;
 import gr.thmmy.mthmmy.model.ThmmyFile;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.utils.CircleTransform;
-import gr.thmmy.mthmmy.utils.EditorView;
-import gr.thmmy.mthmmy.utils.EmojiKeyboard;
+import gr.thmmy.mthmmy.editorview.EditorView;
+import gr.thmmy.mthmmy.editorview.EmojiKeyboard;
 import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import gr.thmmy.mthmmy.viewmodel.TopicViewModel;
 import timber.log.Timber;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/AutoFitGridLayout.java b/app/src/main/java/gr/thmmy/mthmmy/editorview/AutoFitGridLayout.java
similarity index 98%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/AutoFitGridLayout.java
rename to app/src/main/java/gr/thmmy/mthmmy/editorview/AutoFitGridLayout.java
index 3b048c37..8e3055e5 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/AutoFitGridLayout.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/editorview/AutoFitGridLayout.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.editorview;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java b/app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java
similarity index 99%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
rename to app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java
index 5c8bbab9..0b7d8f9f 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.editorview;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java b/app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboard.java
similarity index 97%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
rename to app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboard.java
index b1284b04..95acec1b 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboard.java
@@ -1,13 +1,7 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.editorview;
 
 import android.content.Context;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.AnimationDrawable;
-import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.support.v7.widget.AppCompatImageButton;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboardAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboardAdapter.java
similarity index 98%
rename from app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboardAdapter.java
rename to app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboardAdapter.java
index 754aff18..40fe4db5 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboardAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboardAdapter.java
@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.editorview;
 
 import android.graphics.drawable.AnimationDrawable;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/res/layout/activity_topic.xml b/app/src/main/res/layout/activity_topic.xml
index 7e26b827..f331ceb9 100644
--- a/app/src/main/res/layout/activity_topic.xml
+++ b/app/src/main/res/layout/activity_topic.xml
@@ -50,7 +50,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="gr.thmmy.mthmmy.activities.topic.TopicActivity" />
 
-        <gr.thmmy.mthmmy.utils.EmojiKeyboard
+        <gr.thmmy.mthmmy.editorview.EmojiKeyboard
             android:id="@+id/emoji_keyboard"
             android:layout_width="match_parent"
             android:layout_height="240dp"
diff --git a/app/src/main/res/layout/activity_topic_edit_row.xml b/app/src/main/res/layout/activity_topic_edit_row.xml
index 183b7560..2feeaa0d 100644
--- a/app/src/main/res/layout/activity_topic_edit_row.xml
+++ b/app/src/main/res/layout/activity_topic_edit_row.xml
@@ -80,7 +80,7 @@
                     android:textSize="10sp"
                     tools:ignore="SmallSp" />
             </RelativeLayout>
-            <gr.thmmy.mthmmy.utils.EditorView
+            <gr.thmmy.mthmmy.editorview.EditorView
                 android:id="@+id/edit_editorview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_topic_quick_reply_row.xml b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
index 63b0cdf6..eb8569c5 100644
--- a/app/src/main/res/layout/activity_topic_quick_reply_row.xml
+++ b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
@@ -80,7 +80,7 @@
                     android:textSize="10sp"
                     tools:ignore="SmallSp" />
             </RelativeLayout>
-            <gr.thmmy.mthmmy.utils.EditorView
+            <gr.thmmy.mthmmy.editorview.EditorView
                 android:id="@+id/reply_editorview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/editor_view.xml b/app/src/main/res/layout/editor_view.xml
index 97b8c1b6..0c36c0cd 100644
--- a/app/src/main/res/layout/editor_view.xml
+++ b/app/src/main/res/layout/editor_view.xml
@@ -4,7 +4,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <gr.thmmy.mthmmy.utils.AutoFitGridLayout
+    <gr.thmmy.mthmmy.editorview.AutoFitGridLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -114,7 +114,7 @@
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_functions_black_36dp"
             android:background="?android:selectableItemBackground"/>
-    </gr.thmmy.mthmmy.utils.AutoFitGridLayout>
+    </gr.thmmy.mthmmy.editorview.AutoFitGridLayout>
 
     <LinearLayout
         android:layout_width="match_parent"