diff --git a/android/FarmAlarm/app/app-release.apk b/android/FarmAlarm/app/app-release.apk
index 9f4125b..1d03c6f 100644
Binary files a/android/FarmAlarm/app/app-release.apk and b/android/FarmAlarm/app/app-release.apk differ
diff --git a/android/FarmAlarm/app/build.gradle b/android/FarmAlarm/app/build.gradle
index 3509e1e..3548dfd 100644
--- a/android/FarmAlarm/app/build.gradle
+++ b/android/FarmAlarm/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 24
     buildToolsVersion "24.0.1"
     defaultConfig {
-        applicationId "com.zoblak.farmalarm"
+        applicationId "com.zoblak.farm"
         minSdkVersion 15
         targetSdkVersion 24
         versionCode 1
diff --git a/android/FarmAlarm/app/src/androidTest/java/com/zoblak/farmalarm/ExampleInstrumentedTest.java b/android/FarmAlarm/app/src/androidTest/java/com/zoblak/farm/ExampleInstrumentedTest.java
similarity index 85%
rename from android/FarmAlarm/app/src/androidTest/java/com/zoblak/farmalarm/ExampleInstrumentedTest.java
rename to android/FarmAlarm/app/src/androidTest/java/com/zoblak/farm/ExampleInstrumentedTest.java
index e46e2e5..d4a18fc 100644
--- a/android/FarmAlarm/app/src/androidTest/java/com/zoblak/farmalarm/ExampleInstrumentedTest.java
+++ b/android/FarmAlarm/app/src/androidTest/java/com/zoblak/farm/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.zoblak.farmalarm", appContext.getPackageName());
+        assertEquals("com.zoblak.apps.farmalarm", appContext.getPackageName());
     }
 }
diff --git a/android/FarmAlarm/app/src/main/AndroidManifest.xml b/android/FarmAlarm/app/src/main/AndroidManifest.xml
index fbf0261..0f313d9 100644
--- a/android/FarmAlarm/app/src/main/AndroidManifest.xml
+++ b/android/FarmAlarm/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zoblak.farmalarm">
+    package="com.zoblak.farm">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainScreen"
+            android:name="com.zoblak.farm.MainScreen"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
@@ -36,29 +36,29 @@
         </activity>
 
         <service
-            android:name=".AlarmPollingService"
+            android:name="com.zoblak.farm.AlarmPollingService"
             android:exported="false" />
         <service
-            android:name=".SoundPlayingService"
+            android:name="com.zoblak.farm.SoundPlayingService"
             android:exported="false" />
 
         <receiver
-            android:name=".PeriodicalPingReceiver"
+            android:name="com.zoblak.farm.PeriodicalPingReceiver"
             android:enabled="true"
             android:exported="true" />
 
         <activity
-            android:name=".SettingsActivity"
+            android:name="com.zoblak.farm.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".MainScreen"
+            android:parentActivityName="com.zoblak.farm.MainScreen"
             android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.zoblak.farmalarm.MainScreen" />
+                android:value="com.zoblak.farm.MainScreen" />
         </activity>
 
         <receiver
-            android:name=".BootBroadcastReceiver"
+            android:name="com.zoblak.farm.BootBroadcastReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmNotification.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmNotification.java
similarity index 99%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmNotification.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmNotification.java
index 0daee78..f6173d6 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmNotification.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmNotification.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -9,7 +9,6 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.net.Uri;
 import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPingResponse.java
similarity index 98%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPingResponse.java
index 88dac4d..8fd8be7 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPingResponse.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPingResponse.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 /**
  * Created by senadu on 11/15/16.
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPollingService.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPollingService.java
similarity index 85%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPollingService.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPollingService.java
index 613cceb..fa816c8 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmPollingService.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmPollingService.java
@@ -1,14 +1,9 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.app.IntentService;
 import android.content.Intent;
 import android.content.Context;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.PowerManager;
-import android.util.Log;
-import android.widget.Toast;
 
 /**
  * An {@link IntentService} subclass for handling asynchronous task requests in
@@ -20,11 +15,11 @@ import android.widget.Toast;
 public class AlarmPollingService extends IntentService {
     // TODO: Rename actions, choose action names that describe tasks that this
     // IntentService can perform, e.g. ACTION_FETCH_NEW_ITEMS
-    private static final String ACTION_PING = "com.zoblak.farmalarm.action.PING";
-    private static final String ACTION_STOP_ALARM = "com.zoblak.farmalarm.action.STOP_ALARM";
+    private static final String ACTION_PING = "com.zoblak.apps.farmalarm.action.PING";
+    private static final String ACTION_STOP_ALARM = "com.zoblak.apps.farmalarm.action.STOP_ALARM";
 
     // TODO: Rename parameters
-    private static final String CONTROLLERS = "com.zoblak.farmalarm.extra.CONTROLLLERS";
+    private static final String CONTROLLERS = "com.zoblak.apps.farmalarm.extra.CONTROLLLERS";
 
     private AlarmResponseHandler handler;
 
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmResponseHandler.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmResponseHandler.java
similarity index 66%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmResponseHandler.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmResponseHandler.java
index 8f98751..2031469 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AlarmResponseHandler.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AlarmResponseHandler.java
@@ -1,14 +1,6 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.media.AudioAttributes;
-import android.media.AudioManager;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
 
 /**
  * Created by senadu on 11/15/16.
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AppCompatPreferenceActivity.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AppCompatPreferenceActivity.java
similarity index 98%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AppCompatPreferenceActivity.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/AppCompatPreferenceActivity.java
index 4d150bd..e2c1930 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/AppCompatPreferenceActivity.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/AppCompatPreferenceActivity.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/BootBroadcastReceiver.java
similarity index 91%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/BootBroadcastReceiver.java
index a885ae1..64dee74 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/BootBroadcastReceiver.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreen.java
similarity index 90%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreen.java
index ffe482b..322edb6 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreen.java
@@ -1,18 +1,12 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreenFragment.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreenFragment.java
similarity index 97%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreenFragment.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreenFragment.java
index ce8efb4..6a1060d 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreenFragment.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/MainScreenFragment.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/PeriodicalPingReceiver.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/PeriodicalPingReceiver.java
similarity index 81%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/PeriodicalPingReceiver.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/PeriodicalPingReceiver.java
index 4649802..9ddb0c0 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/PeriodicalPingReceiver.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/PeriodicalPingReceiver.java
@@ -1,15 +1,10 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.PowerManager;
 import android.preference.PreferenceManager;
-import android.util.Log;
-import android.widget.Toast;
-
-import static android.content.Context.POWER_SERVICE;
 
 public class PeriodicalPingReceiver extends BroadcastReceiver {
     public PeriodicalPingReceiver() {
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SettingsActivity.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/SettingsActivity.java
similarity index 99%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SettingsActivity.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/SettingsActivity.java
index 49b265c..dcbc7fd 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SettingsActivity.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 
 import android.annotation.TargetApi;
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SoundPlayingService.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/SoundPlayingService.java
similarity index 98%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SoundPlayingService.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/SoundPlayingService.java
index 9428c59..406add4 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/SoundPlayingService.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/SoundPlayingService.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/ZoblakClient.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/ZoblakClient.java
similarity index 98%
rename from android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/ZoblakClient.java
rename to android/FarmAlarm/app/src/main/java/com/zoblak/farm/ZoblakClient.java
index 3128bd8..d9592ac 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/ZoblakClient.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farm/ZoblakClient.java
@@ -1,10 +1,10 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 
 import android.util.JsonReader;
 import android.util.JsonToken;
 import android.util.Log;
-import java.io.BufferedInputStream;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
diff --git a/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml b/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
index 3f2f659..e9a00c3 100644
--- a/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
+++ b/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.zoblak.farmalarm.MainScreen">
+    tools:context="com.zoblak.farm.MainScreen">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/android/FarmAlarm/app/src/main/res/layout/content_main_screen.xml b/android/FarmAlarm/app/src/main/res/layout/content_main_screen.xml
index fabd177..c973210 100644
--- a/android/FarmAlarm/app/src/main/res/layout/content_main_screen.xml
+++ b/android/FarmAlarm/app/src/main/res/layout/content_main_screen.xml
@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/fragment"
-    android:name="com.zoblak.farmalarm.MainScreenFragment"
+    android:name="com.zoblak.farm.MainScreenFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/android/FarmAlarm/app/src/main/res/layout/fragment_main_screen.xml b/android/FarmAlarm/app/src/main/res/layout/fragment_main_screen.xml
index d25fd23..b9c68cf 100644
--- a/android/FarmAlarm/app/src/main/res/layout/fragment_main_screen.xml
+++ b/android/FarmAlarm/app/src/main/res/layout/fragment_main_screen.xml
@@ -8,7 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.zoblak.farmalarm.MainScreenFragment"
+    tools:context="com.zoblak.farm.MainScreenFragment"
     tools:showIn="@layout/activity_main_screen">
 
     <WebView
diff --git a/android/FarmAlarm/app/src/main/res/menu/menu_main_screen.xml b/android/FarmAlarm/app/src/main/res/menu/menu_main_screen.xml
index 607449f..9bad085 100644
--- a/android/FarmAlarm/app/src/main/res/menu/menu_main_screen.xml
+++ b/android/FarmAlarm/app/src/main/res/menu/menu_main_screen.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.zoblak.farmalarm.MainScreen">
+    tools:context="com.zoblak.farm.MainScreen">
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/android/FarmAlarm/app/src/main/res/xml/pref_headers.xml b/android/FarmAlarm/app/src/main/res/xml/pref_headers.xml
index 89ff289..ac0d23c 100644
--- a/android/FarmAlarm/app/src/main/res/xml/pref_headers.xml
+++ b/android/FarmAlarm/app/src/main/res/xml/pref_headers.xml
@@ -3,7 +3,7 @@
     <!-- These settings headers are only used on tablets. -->
 
     <header
-        android:fragment="com.zoblak.farmalarm.SettingsActivity$GeneralPreferenceFragment"
+        android:fragment="com.zoblak.farm.SettingsActivity$GeneralPreferenceFragment"
         android:icon="@drawable/ic_info_black_24dp"
         android:title="@string/pref_header_general" />
 
diff --git a/android/FarmAlarm/app/src/test/java/com/zoblak/farmalarm/ExampleUnitTest.java b/android/FarmAlarm/app/src/test/java/com/zoblak/farm/ExampleUnitTest.java
similarity index 92%
rename from android/FarmAlarm/app/src/test/java/com/zoblak/farmalarm/ExampleUnitTest.java
rename to android/FarmAlarm/app/src/test/java/com/zoblak/farm/ExampleUnitTest.java
index ab1cf2f..c01eb12 100644
--- a/android/FarmAlarm/app/src/test/java/com/zoblak/farmalarm/ExampleUnitTest.java
+++ b/android/FarmAlarm/app/src/test/java/com/zoblak/farm/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.zoblak.farmalarm;
+package com.zoblak.farm;
 
 import org.junit.Test;