diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/androidTest/java/tu_darmstadt/sudoku/view/ApplicationTest.java b/app/src/androidTest/java/tu_darmstadt/sudoku/view/ApplicationTest.java
deleted file mode 100644
index 14f8c61..0000000
--- a/app/src/androidTest/java/tu_darmstadt/sudoku/view/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tu_darmstadt.sudoku.ui.view;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d97885d..3f96727 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 xmlns:android="http://schemas.android.com/apk/res/android"
-    package="tu_darmstadt.sudoku.ui.view" >
+    package="org.secuso.privacyfriendlysudoku.ui.view" >
 
     <application
         android:allowBackup="true"
@@ -9,7 +9,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="tu_darmstadt.sudoku.ui.MainActivity"
+            android:name="org.secuso.privacyfriendlysudoku.ui.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar" >
             <intent-filter>
@@ -19,24 +19,23 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="tu_darmstadt.sudoku.ui.SettingsActivity"
+            android:name="org.secuso.privacyfriendlysudoku.ui.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName="tu_darmstadt.sudoku.ui.MainActivity" >
+            android:parentActivityName="org.secuso.privacyfriendlysudoku.ui.MainActivity" >
         </activity>
         <activity
-            android:name="tu_darmstadt.sudoku.ui.GameActivity"
+            android:name="org.secuso.privacyfriendlysudoku.ui.GameActivity"
             android:label="@string/title_activity_game_view"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" >
         </activity>
-        <activity android:name="tu_darmstadt.sudoku.ui.AboutActivity" >
+        <activity android:name="org.secuso.privacyfriendlysudoku.ui.AboutActivity" >
         </activity>
-        <activity android:name="tu_darmstadt.sudoku.ui.LoadGameActivity" >
+        <activity android:name="org.secuso.privacyfriendlysudoku.ui.LoadGameActivity" >
         </activity>
         <activity
-            android:name="tu_darmstadt.sudoku.ui.StatsActivity"
-            android:label="@string/title_activity_stats"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:name="org.secuso.privacyfriendlysudoku.ui.StatsActivity"
+            android:theme="@style/AppTheme.NoActionBar">
         </activity>
     </application>
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/GameController.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java
similarity index 95%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/GameController.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java
index 78bb19f..bbf0405 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/GameController.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameController.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -9,18 +9,18 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.game.CellConflict;
-import tu_darmstadt.sudoku.game.CellConflictList;
-import tu_darmstadt.sudoku.game.GameBoard;
-import tu_darmstadt.sudoku.game.GameCell;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
-import tu_darmstadt.sudoku.game.ICellAction;
-import tu_darmstadt.sudoku.game.listener.IGameSolvedListener;
-import tu_darmstadt.sudoku.game.listener.IHighlightChangedListener;
-import tu_darmstadt.sudoku.game.listener.IModelChangedListener;
-import tu_darmstadt.sudoku.game.listener.ITimerListener;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.CellConflict;
+import org.secuso.privacyfriendlysudoku.game.CellConflictList;
+import org.secuso.privacyfriendlysudoku.game.GameBoard;
+import org.secuso.privacyfriendlysudoku.game.GameCell;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.game.ICellAction;
+import org.secuso.privacyfriendlysudoku.game.listener.IGameSolvedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.IHighlightChangedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.IModelChangedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.ITimerListener;
 
 /**
  * Created by Chris on 06.11.2015.
@@ -171,8 +171,8 @@ public class GameController implements IModelChangedListener {
         }
 
         int[] solved = solve();
-        // TODO test every placed value so far
-        // and reveal the selected value.
+        //
+        // reveal the selected value.
         selectValue(solved[selectedRow * getSize() + selectedCol]);
         usedHints++;
     }
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/GameStateManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java
similarity index 98%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/GameStateManager.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java
index 20f2284..8022363 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/GameStateManager.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GameStateManager.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -11,7 +11,7 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
 
 /**
  * Created by Chris on 16.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/Highscore.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java
similarity index 57%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/Highscore.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java
index e948e69..9c3831c 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/Highscore.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Highscore.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 /**
  * Created by Chris on 17.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/NewLevelManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java
similarity index 98%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/NewLevelManager.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java
index 514f761..04ecda9 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/NewLevelManager.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -12,8 +12,8 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 /**
  * Created by Chris on 23.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/QQWingController.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/QQWingController.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java
index 95c9298..e8a6751 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/QQWingController.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/QQWingController.java
@@ -1,21 +1,19 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
-import android.os.*;
 import android.util.Log;
 
 import java.util.LinkedList;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.Date;
-import java.util.concurrent.atomic.AtomicIntegerArray;
 
-import tu_darmstadt.sudoku.controller.qqwing.Action;
-import tu_darmstadt.sudoku.controller.qqwing.PrintStyle;
-import tu_darmstadt.sudoku.controller.qqwing.QQWing;
-import tu_darmstadt.sudoku.controller.qqwing.Symmetry;
-import tu_darmstadt.sudoku.game.GameBoard;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.controller.qqwing.Action;
+import org.secuso.privacyfriendlysudoku.controller.qqwing.PrintStyle;
+import org.secuso.privacyfriendlysudoku.controller.qqwing.QQWing;
+import org.secuso.privacyfriendlysudoku.controller.qqwing.Symmetry;
+import org.secuso.privacyfriendlysudoku.game.GameBoard;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 /**
  * Created by Chris on 21.11.2015.
@@ -131,7 +129,7 @@ public class QQWingController {
                                             if (havePuzzle) {
                                                 puzzleCount.getAndDecrement();
                                             } else {
-                                                // TODO: Puzzle to solve is impossible.
+                                                // Puzzle to solve is impossible.
                                                 solveImpossible = true;
                                             }
                                         } else {
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/SaveLoadStatistics.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java
similarity index 91%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/SaveLoadStatistics.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java
index 897f704..c993f56 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/SaveLoadStatistics.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java
@@ -1,21 +1,18 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.util.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.controller.helper.HighscoreInfoContainer;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.controller.helper.HighscoreInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 /**
  * Created by TMZ_LToP on 19.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java
similarity index 96%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java
index 08c99c8..4135a30 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/Symbol.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 /**
  * Created by Chris on 17.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/UndoRedoManager.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/UndoRedoManager.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java
index f0a7d4a..e9408ec 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/UndoRedoManager.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/UndoRedoManager.java
@@ -1,9 +1,8 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 import java.util.LinkedList;
-import java.util.List;
 
-import tu_darmstadt.sudoku.game.GameBoard;
+import org.secuso.privacyfriendlysudoku.game.GameBoard;
 
 /**
  * Created by Chris on 24.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/helper/GameInfoContainer.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/helper/GameInfoContainer.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java
index 6b13da8..195c57d 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/helper/GameInfoContainer.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/GameInfoContainer.java
@@ -1,15 +1,15 @@
-package tu_darmstadt.sudoku.controller.helper;
+package org.secuso.privacyfriendlysudoku.controller.helper;
 
 import android.util.Log;
 
 import java.util.Date;
 
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.controller.Symbol;
-import tu_darmstadt.sudoku.game.GameCell;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
-import tu_darmstadt.sudoku.game.ICellAction;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.controller.Symbol;
+import org.secuso.privacyfriendlysudoku.game.GameCell;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.game.ICellAction;
 
 /**
  * Created by Chris on 17.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/helper/HighscoreInfoContainer.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/helper/HighscoreInfoContainer.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java
index e18d468..d4dda5f 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/helper/HighscoreInfoContainer.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/helper/HighscoreInfoContainer.java
@@ -1,8 +1,8 @@
-package tu_darmstadt.sudoku.controller.helper;
+package org.secuso.privacyfriendlysudoku.controller.helper;
 
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 /**
  * Created by Chris on 18.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/Action.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/Action.java
similarity index 93%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/Action.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/Action.java
index 28abb60..8b3dd25 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/Action.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/Action.java
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 // @formatter:on
-package tu_darmstadt.sudoku.controller.qqwing;
+package org.secuso.privacyfriendlysudoku.controller.qqwing;
 
 public enum Action {
 	NONE,
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/LogItem.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/LogItem.java
similarity index 98%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/LogItem.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/LogItem.java
index 3526005..93184df 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/LogItem.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/LogItem.java
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 // @formatter:on
-package tu_darmstadt.sudoku.controller.qqwing;
+package org.secuso.privacyfriendlysudoku.controller.qqwing;
 
 /**
  * While solving the puzzle, log steps taken in a log item. This is useful for
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/LogType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/LogType.java
similarity index 97%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/LogType.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/LogType.java
index 2728f58..0e7ae49 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/LogType.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/LogType.java
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 // @formatter:on
-package tu_darmstadt.sudoku.controller.qqwing;
+package org.secuso.privacyfriendlysudoku.controller.qqwing;
 
 public enum LogType {
 	GIVEN("Mark given"),
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/PrintStyle.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/PrintStyle.java
similarity index 93%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/PrintStyle.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/PrintStyle.java
index 8051362..fb242b3 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/PrintStyle.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/PrintStyle.java
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 // @formatter:on
-package tu_darmstadt.sudoku.controller.qqwing;
+package org.secuso.privacyfriendlysudoku.controller.qqwing;
 
 public enum PrintStyle {
 	ONE_LINE,
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/QQWing.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/QQWing.java
similarity index 99%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/QQWing.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/QQWing.java
index 6acba4a..2cfb7c5 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/QQWing.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/QQWing.java
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 // @formatter:on
-package tu_darmstadt.sudoku.controller.qqwing;
+package org.secuso.privacyfriendlysudoku.controller.qqwing;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,8 +28,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 /**
  * The board containing all the memory structures and methods for solving or
diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/Symmetry.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/Symmetry.java
similarity index 95%
rename from app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/Symmetry.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/Symmetry.java
index 75fe83e..d78fc3f 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/Symmetry.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/controller/qqwing/Symmetry.java
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 // @formatter:on
-package tu_darmstadt.sudoku.controller.qqwing;
+package org.secuso.privacyfriendlysudoku.controller.qqwing;
 
 import java.util.Locale;
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/CellConflict.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/game/CellConflict.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java
index bd61548..9909871 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/CellConflict.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflict.java
@@ -1,6 +1,4 @@
-package tu_darmstadt.sudoku.game;
-
-import java.util.LinkedList;
+package org.secuso.privacyfriendlysudoku.game;
 
 /**
  * Created by Chris on 08.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/CellConflictList.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java
similarity index 91%
rename from app/src/main/java/tu_darmstadt/sudoku/game/CellConflictList.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java
index 8b27c90..cf49830 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/CellConflictList.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/CellConflictList.java
@@ -1,6 +1,4 @@
-package tu_darmstadt.sudoku.game;
-
-import android.support.annotation.NonNull;
+package org.secuso.privacyfriendlysudoku.game;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/GameBoard.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java
similarity index 98%
rename from app/src/main/java/tu_darmstadt/sudoku/game/GameBoard.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java
index f7120d5..0bc85e3 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/GameBoard.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameBoard.java
@@ -1,9 +1,9 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.game.listener.IModelChangedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.IModelChangedListener;
 
 /**
  * Created by Christopher Beckmann on 06.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/GameCell.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java
similarity index 97%
rename from app/src/main/java/tu_darmstadt/sudoku/game/GameCell.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java
index 2087524..93e28df 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/GameCell.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameCell.java
@@ -1,10 +1,10 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.game.listener.IModelChangedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.IModelChangedListener;
 
 /**
  * Created by Chris on 06.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/GameDifficulty.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java
similarity index 88%
rename from app/src/main/java/tu_darmstadt/sudoku/game/GameDifficulty.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java
index 5f630b5..f6e2304 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/GameDifficulty.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameDifficulty.java
@@ -1,10 +1,10 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 import android.support.annotation.StringRes;
 
 import java.util.LinkedList;
 
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 /**
  * Created by Chris on 18.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/GameSettings.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/game/GameSettings.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java
index 04ffcd3..0b40c2e 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/GameSettings.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameSettings.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 /**
  * Created by Chris on 09.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/GameStatus.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java
similarity index 70%
rename from app/src/main/java/tu_darmstadt/sudoku/game/GameStatus.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java
index 9bdc701..3fa213d 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/GameStatus.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameStatus.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 /**
  * Created by Chris on 10.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/GameType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/game/GameType.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java
index 910b64d..49b9a80 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/GameType.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/GameType.java
@@ -1,9 +1,8 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 import java.util.LinkedList;
-import java.util.List;
 
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 /**
  * Created by Chris on 09.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/ICellAction.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java
similarity index 71%
rename from app/src/main/java/tu_darmstadt/sudoku/game/ICellAction.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java
index f2ee966..0cf6815 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/ICellAction.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/ICellAction.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.game;
+package org.secuso.privacyfriendlysudoku.game;
 
 /**
  * Created by Chris on 10.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/listener/IGameSolvedListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java
similarity index 66%
rename from app/src/main/java/tu_darmstadt/sudoku/game/listener/IGameSolvedListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java
index ecd3723..7a5eecb 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/listener/IGameSolvedListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IGameSolvedListener.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.game.listener;
+package org.secuso.privacyfriendlysudoku.game.listener;
 
 /**
  * Created by Chris on 19.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/listener/IHighlightChangedListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java
similarity index 69%
rename from app/src/main/java/tu_darmstadt/sudoku/game/listener/IHighlightChangedListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java
index 9fb9043..1740595 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/listener/IHighlightChangedListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IHighlightChangedListener.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.game.listener;
+package org.secuso.privacyfriendlysudoku.game.listener;
 
 /**
  * Created by Chris on 19.12.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/listener/IModelChangedListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java
similarity index 54%
rename from app/src/main/java/tu_darmstadt/sudoku/game/listener/IModelChangedListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java
index 2214a43..0c25859 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/listener/IModelChangedListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/IModelChangedListener.java
@@ -1,6 +1,6 @@
-package tu_darmstadt.sudoku.game.listener;
+package org.secuso.privacyfriendlysudoku.game.listener;
 
-import tu_darmstadt.sudoku.game.GameCell;
+import org.secuso.privacyfriendlysudoku.game.GameCell;
 
 /**
  * Created by Chris on 19.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/game/listener/ITimerListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java
similarity index 67%
rename from app/src/main/java/tu_darmstadt/sudoku/game/listener/ITimerListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java
index ec07c0d..8d0743c 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/game/listener/ITimerListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/game/listener/ITimerListener.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.game.listener;
+package org.secuso.privacyfriendlysudoku.game.listener;
 
 /**
  * Created by TMZ_LToP on 20.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/AboutActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java
similarity index 86%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/AboutActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java
index 7258425..3574c92 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/AboutActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AboutActivity.java
@@ -1,15 +1,12 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
-import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MenuItem;
-import android.widget.TextView;
 
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 public class AboutActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/AppCompatPreferenceActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java
similarity index 98%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/AppCompatPreferenceActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java
index 513ea9a..0a7891c 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/AppCompatPreferenceActivity.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
similarity index 89%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
index e3368aa..bf472ba 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -26,22 +26,22 @@ import android.widget.Toast;
 import java.util.LinkedList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.controller.GameStateManager;
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.controller.SaveLoadStatistics;
-import tu_darmstadt.sudoku.controller.Symbol;
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
-import tu_darmstadt.sudoku.game.listener.IGameSolvedListener;
-import tu_darmstadt.sudoku.game.listener.ITimerListener;
-import tu_darmstadt.sudoku.ui.listener.IHintDialogFragmentListener;
-import tu_darmstadt.sudoku.ui.listener.IResetDialogFragmentListener;
-import tu_darmstadt.sudoku.ui.view.DialogWinScreen;
-import tu_darmstadt.sudoku.ui.view.R;
-import tu_darmstadt.sudoku.ui.view.SudokuFieldLayout;
-import tu_darmstadt.sudoku.ui.view.SudokuKeyboardLayout;
-import tu_darmstadt.sudoku.ui.view.SudokuSpecialButtonLayout;
+import org.secuso.privacyfriendlysudoku.controller.GameStateManager;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.controller.SaveLoadStatistics;
+import org.secuso.privacyfriendlysudoku.controller.Symbol;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.game.listener.IGameSolvedListener;
+import org.secuso.privacyfriendlysudoku.game.listener.ITimerListener;
+import org.secuso.privacyfriendlysudoku.ui.listener.IHintDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.ui.listener.IResetDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.ui.view.DialogWinScreen;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.ui.view.SudokuFieldLayout;
+import org.secuso.privacyfriendlysudoku.ui.view.SudokuKeyboardLayout;
+import org.secuso.privacyfriendlysudoku.ui.view.SudokuSpecialButtonLayout;
 
 public class GameActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, IGameSolvedListener ,ITimerListener, IHintDialogFragmentListener, IResetDialogFragmentListener {
 
@@ -207,8 +207,9 @@ public class GameActivity extends AppCompatActivity implements NavigationView.On
             case R.id.nav_newgame:
                 //create new game
                 intent = new Intent(this, MainActivity.class);
-                finish();
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 startActivity(intent);
+                finish();
                 break;
 
             case R.id.menu_settings:
@@ -219,7 +220,6 @@ public class GameActivity extends AppCompatActivity implements NavigationView.On
 
             case R.id.nav_highscore:
                 // see highscore list
-
                 intent = new Intent(this, StatsActivity.class);
                 startActivity(intent);
                 break;
@@ -251,7 +251,7 @@ public class GameActivity extends AppCompatActivity implements NavigationView.On
         gameController.pauseTimer();
         gameController.deleteGame(this);
 
-        Toast t = Toast.makeText(this,"Congratulations you have solved the puzzle!", Toast.LENGTH_SHORT);
+        Toast t = Toast.makeText(this, R.string.win_text, Toast.LENGTH_SHORT);
         t.show();
 
         SaveLoadStatistics s = new SaveLoadStatistics(this);
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/LoadGameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java
similarity index 95%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/LoadGameActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java
index d48dee4..48988f3 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/LoadGameActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -29,11 +29,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.TimeZone;
 
-import tu_darmstadt.sudoku.controller.GameStateManager;
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.ui.listener.IDeleteDialogFragmentListener;
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.controller.GameStateManager;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.ui.listener.IDeleteDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 public class LoadGameActivity extends AppCompatActivity implements IDeleteDialogFragmentListener {
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
similarity index 92%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
index 721386f..cb38e75 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -1,11 +1,10 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.design.widget.NavigationView;
-import android.support.v4.content.SharedPreferencesCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -33,13 +32,13 @@ import android.widget.Toast;
 import java.util.LinkedList;
 import java.util.List;
 
-import tu_darmstadt.sudoku.controller.GameStateManager;
-import tu_darmstadt.sudoku.controller.NewLevelManager;
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
-import tu_darmstadt.sudoku.ui.view.DialogWinScreen;
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.controller.GameStateManager;
+import org.secuso.privacyfriendlysudoku.controller.NewLevelManager;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.ui.view.DialogWinScreen;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener{
 
@@ -161,18 +160,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         if(view instanceof Button) {
             Button b = (Button)view;
             switch(b.getId()) {
-                /**case R.id.aboutButton:
-                    i = new Intent(this, AboutActivity.class);
-                    break;
-                case R.id.highscoreButton:
-                    i = new Intent(this,StatsActivity.class);
-                    break;
-                case R.id.settingsButton:
-                    i = new Intent(this, SettingsActivity.class);
-                    break;
-                case R.id.helpButton:
-                    // TODO: create help page.. what is supposed to be in there?!
-                    break;*/
                 case R.id.continueButton:
                     i = new Intent(this, LoadGameActivity.class);
                     break;
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/SettingsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
similarity index 96%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/SettingsActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
index 680d1f7..05bd179 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/SettingsActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/SettingsActivity.java
@@ -1,13 +1,9 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Configuration;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -16,11 +12,9 @@ import android.preference.PreferenceActivity;
 import android.support.v7.app.ActionBar;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
-import android.preference.RingtonePreference;
-import android.text.TextUtils;
 import android.view.MenuItem;
 
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 import java.util.List;
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/StatsActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java
similarity index 96%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/StatsActivity.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java
index b3a0d49..34c27c0 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/StatsActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/StatsActivity.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui;
+package org.secuso.privacyfriendlysudoku.ui;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -24,10 +24,10 @@ import android.widget.TextView;
 
 import java.util.List;
 
-import tu_darmstadt.sudoku.controller.SaveLoadStatistics;
-import tu_darmstadt.sudoku.controller.helper.HighscoreInfoContainer;
-import tu_darmstadt.sudoku.game.GameType;
-import tu_darmstadt.sudoku.ui.view.R;
+import org.secuso.privacyfriendlysudoku.controller.SaveLoadStatistics;
+import org.secuso.privacyfriendlysudoku.controller.helper.HighscoreInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.ui.view.R;
 
 public class StatsActivity extends AppCompatActivity {
 
@@ -94,7 +94,7 @@ public class StatsActivity extends AppCompatActivity {
                 SaveLoadStatistics.resetStats(this);
                 mSectionsPagerAdapter.refresh(this);
                 return true;
-            case R.id.home:
+            case android.R.id.home:
                 finish();
                 return true;
         }
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/listener/IDeleteDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java
similarity index 72%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/listener/IDeleteDialogFragmentListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java
index 9e8eb95..1005c65 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/listener/IDeleteDialogFragmentListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IDeleteDialogFragmentListener.java
@@ -1,6 +1,4 @@
-package tu_darmstadt.sudoku.ui.listener;
-
-import android.app.DialogFragment;
+package org.secuso.privacyfriendlysudoku.ui.listener;
 
 /**
  * Created by Chris on 24.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/listener/IHintDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java
similarity index 76%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/listener/IHintDialogFragmentListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java
index 8d5b49c..c22825e 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/listener/IHintDialogFragmentListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IHintDialogFragmentListener.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui.listener;
+package org.secuso.privacyfriendlysudoku.ui.listener;
 
 /**
  * Created by Chris on 17.01.2016.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/listener/IResetDialogFragmentListener.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java
similarity index 77%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/listener/IResetDialogFragmentListener.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java
index 97039aa..89800a3 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/listener/IResetDialogFragmentListener.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/listener/IResetDialogFragmentListener.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui.listener;
+package org.secuso.privacyfriendlysudoku.ui.listener;
 
 /**
  * Created by Chris on 19.01.2016.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/CellHighlightTypes.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java
similarity index 83%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/CellHighlightTypes.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java
index 1a11916..9536477 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/CellHighlightTypes.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 /**
  * Created by Chris on 12.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/DialogWinScreen.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/DialogWinScreen.java
similarity index 78%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/DialogWinScreen.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/DialogWinScreen.java
index da8cadb..1a05a3f 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/DialogWinScreen.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/DialogWinScreen.java
@@ -1,24 +1,16 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
-import android.app.DialogFragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.AnimationUtils;
-import android.view.animation.LinearInterpolator;
-import android.view.animation.RotateAnimation;
-import android.widget.GridLayout;
 import android.widget.ImageView;
 
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
-import tu_darmstadt.sudoku.ui.GameActivity;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.ui.GameActivity;
 
 /**
  * Created by TMZ_LToP on 11.12.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java
similarity index 86%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java
index 86c7337..399445e 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButton.java
@@ -1,10 +1,8 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ToggleButton;
 
 /**
  * Created by TMZ_LToP on 12.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java
index 173057c..ae27f9a 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuButtonType.java
@@ -1,7 +1,6 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuCellView.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java
similarity index 96%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuCellView.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java
index 03fba04..9a7b98c 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuCellView.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -10,8 +10,8 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import tu_darmstadt.sudoku.game.GameCell;
-import tu_darmstadt.sudoku.controller.Symbol;
+import org.secuso.privacyfriendlysudoku.game.GameCell;
+import org.secuso.privacyfriendlysudoku.controller.Symbol;
 
 /**
  * Created by TMZ_LToP on 10.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuFieldLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java
similarity index 94%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuFieldLayout.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java
index 4b50699..938770a 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuFieldLayout.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java
@@ -1,11 +1,10 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Point;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -13,11 +12,11 @@ import android.widget.RelativeLayout;
 
 import java.util.LinkedList;
 
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.controller.Symbol;
-import tu_darmstadt.sudoku.game.GameCell;
-import tu_darmstadt.sudoku.game.ICellAction;
-import tu_darmstadt.sudoku.game.listener.IHighlightChangedListener;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.controller.Symbol;
+import org.secuso.privacyfriendlysudoku.game.GameCell;
+import org.secuso.privacyfriendlysudoku.game.ICellAction;
+import org.secuso.privacyfriendlysudoku.game.listener.IHighlightChangedListener;
 
 /**
  * Created by Timm Lippert on 11.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java
similarity index 91%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java
index 5b85b30..452bdae 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java
@@ -1,14 +1,7 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Canvas;
-import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -19,12 +12,9 @@ import android.widget.GridLayout;
 import android.widget.GridView;
 import android.widget.LinearLayout;
 
-import java.util.LinkedList;
-
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.controller.Symbol;
-import tu_darmstadt.sudoku.game.listener.IHighlightChangedListener;
-import tu_darmstadt.sudoku.ui.listener.IDeleteDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.controller.Symbol;
+import org.secuso.privacyfriendlysudoku.game.listener.IHighlightChangedListener;
 
 /**
  * Created by TMZ_LToP on 12.11.2015.
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java
similarity index 90%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java
index e4c0498..d177ce2 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButton.java
@@ -1,7 +1,6 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 import android.content.Context;
-import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.widget.ImageButton;
 
diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java
similarity index 97%
rename from app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java
rename to app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java
index b41427a..0645c8b 100644
--- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java
+++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java
@@ -1,4 +1,4 @@
-package tu_darmstadt.sudoku.ui.view;
+package org.secuso.privacyfriendlysudoku.ui.view;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -21,8 +21,8 @@ import android.widget.Toast;
 
 import java.util.LinkedList;
 
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.ui.listener.IHintDialogFragmentListener;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.ui.listener.IHintDialogFragmentListener;
 
 /**
  * Created by TMZ_LToP on 17.11.2015.
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index fd8bbf9..0a3f71a 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -90,4 +90,19 @@
         android:layout_gravity="center_horizontal"
         android:autoLink="web"/>
 
+    <TextView
+        android:id="@+id/qqWing"
+        android:layout_marginTop="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/about_qqwing"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/about_qqwingLink"
+        android:layout_gravity="center_horizontal"
+        android:autoLink="web"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index 2fa5432..1879130 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -8,7 +8,6 @@
 
     <android.support.design.widget.AppBarLayout android:id="@+id/appbar"
         android:layout_width="match_parent" android:layout_height="wrap_content"
-        android:paddingTop="@dimen/appbar_padding_top"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <android.support.v7.widget.Toolbar android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/content_game_view.xml b/app/src/main/res/layout/content_game_view.xml
index 4062436..1ea2b10 100644
--- a/app/src/main/res/layout/content_game_view.xml
+++ b/app/src/main/res/layout/content_game_view.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/app_bar_game_view" tools:context="tu_darmstadt.sudoku.activity.GameActivity">
-    <tu_darmstadt.sudoku.ui.view.SudokuFieldLayout
+    <org.secuso.privacyfriendlysudoku.ui.view.SudokuFieldLayout
         android:id="@+id/sudokuLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -24,23 +24,23 @@
         android:orientation="vertical"
         android:weightSum="3">
 
-        <tu_darmstadt.sudoku.ui.view.SudokuKeyboardLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
+        <org.secuso.privacyfriendlysudoku.ui.view.SudokuKeyboardLayout
+            android:layout_width="fill_parent"
+            android:layout_height="0px"
             android:id="@+id/sudokuKeyboardLayout"
             android:orientation="vertical"
             android:layout_weight="2"
             android:weightSum="2">
 
-        </tu_darmstadt.sudoku.ui.view.SudokuKeyboardLayout>
+        </org.secuso.privacyfriendlysudoku.ui.view.SudokuKeyboardLayout>
 
-        <tu_darmstadt.sudoku.ui.view.SudokuSpecialButtonLayout
+        <org.secuso.privacyfriendlysudoku.ui.view.SudokuSpecialButtonLayout
             android:id="@+id/sudokuSpecialLayout"
             android:layout_width="fill_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
 
-        </tu_darmstadt.sudoku.ui.view.SudokuSpecialButtonLayout>
+        </org.secuso.privacyfriendlysudoku.ui.view.SudokuSpecialButtonLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3d38ce..921ea1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,6 +68,8 @@
     <string name="qqwing">This application uses a modified version of QQWing v1.3.4</string>
     <string name="more_info">More information can be found on:</string>
     <string name="url"><a href="https://www.secuso.informatik.tu-darmstadt.de/en/research/results/">https://www.secuso.org</a></string>
+    <string name="about_qqwing">This App uses QQWing.</string>
+    <string name="about_qqwingLink"><a href="http://qqwing.com/download.html">http://qqwing.com/</a></string>
 
     <!-- ###GameDifficulty### -->
     <string name="difficulty_easy">Easy</string>
@@ -105,7 +107,7 @@
 
 
     <!--### Win Strings -->
-    <string name="win_text">Congratulations, you have solved the puzzle.</string>
+    <string name="win_text">Congratulations, you have solved the puzzle!</string>
     <string name="win_button_text">OK!</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index 59d1dfe..84d8226 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -2,11 +2,11 @@
 
     <!-- These settings headers are only used on tablets. -->
 
-    <header android:fragment="tu_darmstadt.sudoku.ui.SettingsActivity$GamePreferenceFragment"
+    <header android:fragment="org.secuso.privacyfriendlysudoku.ui.SettingsActivity$GamePreferenceFragment"
         android:title="@string/pref_header_game" android:icon="@drawable/ic_info_black_24dp" />
 
     <header
-        android:fragment="tu_darmstadt.sudoku.ui.SettingsActivity$HighlightingPreferenceFragment"
+        android:fragment="org.secuso.privacyfriendlysudoku.ui.SettingsActivity$HighlightingPreferenceFragment"
         android:title="Highlighting"
         android:icon="@drawable/ic_notifications_black_24dp" />
 
diff --git a/app/src/test/java/tu_darmstadt/sudoku/controller/GameControllerTest.java b/app/src/test/java/org/secuso/privacyfriendlysudoku/controller/GameControllerTest.java
similarity index 97%
rename from app/src/test/java/tu_darmstadt/sudoku/controller/GameControllerTest.java
rename to app/src/test/java/org/secuso/privacyfriendlysudoku/controller/GameControllerTest.java
index 945e18a..d0aa289 100644
--- a/app/src/test/java/tu_darmstadt/sudoku/controller/GameControllerTest.java
+++ b/app/src/test/java/org/secuso/privacyfriendlysudoku/controller/GameControllerTest.java
@@ -1,11 +1,11 @@
-package tu_darmstadt.sudoku.controller;
+package org.secuso.privacyfriendlysudoku.controller;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 import static org.junit.Assert.*;
 
diff --git a/app/src/test/java/tu_darmstadt/sudoku/game/solver/SolverTest.java b/app/src/test/java/org/secuso/privacyfriendlysudoku/game/solver/SolverTest.java
similarity index 94%
rename from app/src/test/java/tu_darmstadt/sudoku/game/solver/SolverTest.java
rename to app/src/test/java/org/secuso/privacyfriendlysudoku/game/solver/SolverTest.java
index e4e8bc4..0d5eb2f 100644
--- a/app/src/test/java/tu_darmstadt/sudoku/game/solver/SolverTest.java
+++ b/app/src/test/java/org/secuso/privacyfriendlysudoku/game/solver/SolverTest.java
@@ -1,17 +1,12 @@
-package tu_darmstadt.sudoku.game.solver;
-
-import android.util.Log;
+package org.secuso.privacyfriendlysudoku.game.solver;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.LinkedList;
-
-import tu_darmstadt.sudoku.controller.GameController;
-import tu_darmstadt.sudoku.controller.helper.GameInfoContainer;
-import tu_darmstadt.sudoku.game.GameBoard;
-import tu_darmstadt.sudoku.game.GameDifficulty;
-import tu_darmstadt.sudoku.game.GameType;
+import org.secuso.privacyfriendlysudoku.controller.GameController;
+import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer;
+import org.secuso.privacyfriendlysudoku.game.GameDifficulty;
+import org.secuso.privacyfriendlysudoku.game.GameType;
 
 import static junit.framework.Assert.assertEquals;
 
diff --git a/app/src/test/java/tu_darmstadt/sudoku/ExampleUnitTest.java b/app/src/test/java/tu_darmstadt/sudoku/ExampleUnitTest.java
deleted file mode 100644
index 3dcb8fd..0000000
--- a/app/src/test/java/tu_darmstadt/sudoku/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package tu_darmstadt.sudoku.ui.view;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file