diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5524c4..292c1b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
         <activity android:name=".PreferenceActivity"
             android:parentActivityName=".MainActivity"/>
 
-        <receiver android:name=".NotificationAlarmReceiver"
+        <receiver android:name=".createnotification.NotificationAlarmReceiver"
             android:enabled="true">
             <intent-filter>
                 <action android:name="net.headlezz.notificationbroadcast" />
diff --git a/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java b/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
index b2b65de..834397e 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
@@ -10,6 +10,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import net.headlezz.notificationlogger.createnotification.NotificationCreationFragment;
+
 import butterknife.Bind;
 import butterknife.ButterKnife;
 
diff --git a/app/src/main/java/net/headlezz/notificationlogger/DispatchableNotification.java b/app/src/main/java/net/headlezz/notificationlogger/createnotification/DispatchableNotification.java
similarity index 99%
rename from app/src/main/java/net/headlezz/notificationlogger/DispatchableNotification.java
rename to app/src/main/java/net/headlezz/notificationlogger/createnotification/DispatchableNotification.java
index 28abb7b..9194c55 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/DispatchableNotification.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/createnotification/DispatchableNotification.java
@@ -1,4 +1,4 @@
-package net.headlezz.notificationlogger;
+package net.headlezz.notificationlogger.createnotification;
 
 
 import android.app.AlarmManager;
diff --git a/app/src/main/java/net/headlezz/notificationlogger/NotificationAlarmReceiver.java b/app/src/main/java/net/headlezz/notificationlogger/createnotification/NotificationAlarmReceiver.java
similarity index 76%
rename from app/src/main/java/net/headlezz/notificationlogger/NotificationAlarmReceiver.java
rename to app/src/main/java/net/headlezz/notificationlogger/createnotification/NotificationAlarmReceiver.java
index fd4762c..1f21639 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/NotificationAlarmReceiver.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/createnotification/NotificationAlarmReceiver.java
@@ -1,9 +1,11 @@
-package net.headlezz.notificationlogger;
+package net.headlezz.notificationlogger.createnotification;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import net.headlezz.notificationlogger.createnotification.DispatchableNotification;
+
 public class NotificationAlarmReceiver extends BroadcastReceiver {
 
     public static String BROADCAST_INTENT_ACTION = "net.headlezz.notificationbroadcast";
diff --git a/app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java b/app/src/main/java/net/headlezz/notificationlogger/createnotification/NotificationCreationFragment.java
similarity index 97%
rename from app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java
rename to app/src/main/java/net/headlezz/notificationlogger/createnotification/NotificationCreationFragment.java
index d866c7c..f5e1838 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/NotificationCreationFragment.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/createnotification/NotificationCreationFragment.java
@@ -1,4 +1,4 @@
-package net.headlezz.notificationlogger;
+package net.headlezz.notificationlogger.createnotification;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -13,6 +13,8 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Spinner;
 
+import net.headlezz.notificationlogger.R;
+
 import java.util.Date;
 
 import butterknife.Bind;
diff --git a/app/src/main/java/net/headlezz/notificationlogger/SpinnerIconAdapter.java b/app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java
similarity index 95%
rename from app/src/main/java/net/headlezz/notificationlogger/SpinnerIconAdapter.java
rename to app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java
index b85181e..175f447 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/SpinnerIconAdapter.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java
@@ -1,4 +1,4 @@
-package net.headlezz.notificationlogger;
+package net.headlezz.notificationlogger.createnotification;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -9,6 +9,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import net.headlezz.notificationlogger.R;
+
 public class SpinnerIconAdapter extends ArrayAdapter<CharSequence> {
 
     private static final int DROPDOWN_RESOURCE = R.layout.simple_spinner_dropdown_item_with_icon;