diff --git a/app/build.gradle b/app/build.gradle
index 40d6c581..120567d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
     compileSdkVersion 23
     buildToolsVersion "22.0.1"
     defaultConfig {
-        applicationId "calculator.simplemobiletools.com.simple_calculator"
+        applicationId "calculator.simplemobiletools.com"
         minSdkVersion 16
         targetSdkVersion 23
         versionCode 1
diff --git a/app/src/androidTest/java/calculator/simplemobiletools/com/simple_calculator/ApplicationTest.java b/app/src/androidTest/java/calculator/simplemobiletools/com/ApplicationTest.java
similarity index 78%
rename from app/src/androidTest/java/calculator/simplemobiletools/com/simple_calculator/ApplicationTest.java
rename to app/src/androidTest/java/calculator/simplemobiletools/com/ApplicationTest.java
index fc4374e9..e0632771 100644
--- a/app/src/androidTest/java/calculator/simplemobiletools/com/simple_calculator/ApplicationTest.java
+++ b/app/src/androidTest/java/calculator/simplemobiletools/com/ApplicationTest.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/app/src/androidTest/java/calculator/simplemobiletools/com/simple_calculator/MainActivityTest.java b/app/src/androidTest/java/calculator/simplemobiletools/com/MainActivityTest.java
similarity index 98%
rename from app/src/androidTest/java/calculator/simplemobiletools/com/simple_calculator/MainActivityTest.java
rename to app/src/androidTest/java/calculator/simplemobiletools/com/MainActivityTest.java
index ecfcfff0..d1bf497f 100644
--- a/app/src/androidTest/java/calculator/simplemobiletools/com/simple_calculator/MainActivityTest.java
+++ b/app/src/androidTest/java/calculator/simplemobiletools/com/MainActivityTest.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 48b6d2bc..86964da7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="calculator.simplemobiletools.com.simple_calculator"
+    package="calculator.simplemobiletools.com"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Calculator.java b/app/src/main/java/calculator/simplemobiletools/com/Calculator.java
similarity index 69%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Calculator.java
rename to app/src/main/java/calculator/simplemobiletools/com/Calculator.java
index 2700615b..f2d2577b 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Calculator.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/Calculator.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 public interface Calculator {
     void setValue(String value);
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/CalculatorImpl.java b/app/src/main/java/calculator/simplemobiletools/com/CalculatorImpl.java
similarity index 99%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/CalculatorImpl.java
rename to app/src/main/java/calculator/simplemobiletools/com/CalculatorImpl.java
index 136fd5eb..980e281e 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/CalculatorImpl.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/CalculatorImpl.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 public class CalculatorImpl {
     private String displayedValue;
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Constants.java b/app/src/main/java/calculator/simplemobiletools/com/Constants.java
similarity index 95%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Constants.java
rename to app/src/main/java/calculator/simplemobiletools/com/Constants.java
index 306fca4f..0f9f3df3 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Constants.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/Constants.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 public class Constants {
     public static final String DIGIT = "digit";
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java b/app/src/main/java/calculator/simplemobiletools/com/Formatter.java
similarity index 91%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java
rename to app/src/main/java/calculator/simplemobiletools/com/Formatter.java
index c5d15d3b..f28ace5c 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/Formatter.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java b/app/src/main/java/calculator/simplemobiletools/com/MainActivity.java
similarity index 98%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
rename to app/src/main/java/calculator/simplemobiletools/com/MainActivity.java
index ec642313..fde622e1 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/MainActivity.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import android.content.res.Resources;
 import android.os.Bundle;
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MyWidgetConfigure.java b/app/src/main/java/calculator/simplemobiletools/com/MyWidgetConfigure.java
similarity index 98%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MyWidgetConfigure.java
rename to app/src/main/java/calculator/simplemobiletools/com/MyWidgetConfigure.java
index f2ee93f8..e625caad 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MyWidgetConfigure.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/MyWidgetConfigure.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import android.app.Activity;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MyWidgetProvider.java b/app/src/main/java/calculator/simplemobiletools/com/MyWidgetProvider.java
similarity index 99%
rename from app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MyWidgetProvider.java
rename to app/src/main/java/calculator/simplemobiletools/com/MyWidgetProvider.java
index c0968558..213de841 100644
--- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MyWidgetProvider.java
+++ b/app/src/main/java/calculator/simplemobiletools/com/MyWidgetProvider.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a44ea13b..634e2099 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:background="@color/dark_grey"
     android:orientation="vertical"
-    tools:context="calculator.simplemobiletools.com.simple_calculator.MainActivity">
+    tools:context="calculator.simplemobiletools.com.MainActivity">
 
     <TextView
         android:id="@+id/formula"
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
index a1574ec5..5aff25fd 100644
--- a/app/src/main/res/xml/widget_info.xml
+++ b/app/src/main/res/xml/widget_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:configure="calculator.simplemobiletools.com.simple_calculator.MyWidgetConfigure"
+                    android:configure="calculator.simplemobiletools.com.MyWidgetConfigure"
                     android:initialLayout="@layout/activity_main"
                     android:minHeight="250dp"
                     android:minWidth="250dp">
diff --git a/app/src/test/java/calculator/simplemobiletools/com/simple_calculator/MainActivityTest.java b/app/src/test/java/calculator/simplemobiletools/com/MainActivityTest.java
similarity index 98%
rename from app/src/test/java/calculator/simplemobiletools/com/simple_calculator/MainActivityTest.java
rename to app/src/test/java/calculator/simplemobiletools/com/MainActivityTest.java
index a39e5615..b91e76ef 100644
--- a/app/src/test/java/calculator/simplemobiletools/com/simple_calculator/MainActivityTest.java
+++ b/app/src/test/java/calculator/simplemobiletools/com/MainActivityTest.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -7,6 +7,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 import butterknife.ButterKnife;
+import calculator.simplemobiletools.com.BuildConfig;
 
 import static junit.framework.Assert.assertEquals;
 
diff --git a/app/src/test/java/calculator/simplemobiletools/com/simple_calculator/MyTestRunner.java b/app/src/test/java/calculator/simplemobiletools/com/MyTestRunner.java
similarity index 92%
rename from app/src/test/java/calculator/simplemobiletools/com/simple_calculator/MyTestRunner.java
rename to app/src/test/java/calculator/simplemobiletools/com/MyTestRunner.java
index b32abbf2..8b28aed3 100644
--- a/app/src/test/java/calculator/simplemobiletools/com/simple_calculator/MyTestRunner.java
+++ b/app/src/test/java/calculator/simplemobiletools/com/MyTestRunner.java
@@ -1,4 +1,4 @@
-package calculator.simplemobiletools.com.simple_calculator;
+package calculator.simplemobiletools.com;
 
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;