diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d87a3dd..55e9b8c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,9 +7,9 @@
 			  android:targetSdkVersion="14"/>
     <application android:label="@string/app_name" 
 				 android:icon="@drawable/icon"
-				 android:name="org.dyndns.vahagn.sokoban.App"
+				 android:name="org.vostan.sokoban.App"
 				 android:theme="@android:style/Theme">
-        <activity	android:name="org.dyndns.vahagn.sokoban.menu.MainActivity"
+        <activity	android:name="org.vostan.sokoban.menu.MainActivity"
 					android:label="@string/app_name"
 					android:configChanges="keyboardHidden|orientation"
 					android:screenOrientation="portrait" >
@@ -18,7 +18,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity 	android:name="org.dyndns.vahagn.sokoban.play.PlayActivity"
+        <activity 	android:name="org.vostan.sokoban.play.PlayActivity"
 					android:label="@string/play_activity"
 					android:configChanges="keyboardHidden|orientation"
 					android:screenOrientation="portrait" >
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/App.java b/app/src/main/java/org/vostan/sokoban/App.java
similarity index 95%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/App.java
rename to app/src/main/java/org/vostan/sokoban/App.java
index 48d5d47..1021be3 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/App.java
+++ b/app/src/main/java/org/vostan/sokoban/App.java
@@ -1,9 +1,7 @@
-package org.dyndns.vahagn.sokoban;
+package org.vostan.sokoban;
 
 import android.app.Application;
-import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
 public class App extends Application
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/Puzzle.java b/app/src/main/java/org/vostan/sokoban/Puzzle.java
similarity index 97%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/Puzzle.java
rename to app/src/main/java/org/vostan/sokoban/Puzzle.java
index e41252d..23f97f2 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/Puzzle.java
+++ b/app/src/main/java/org/vostan/sokoban/Puzzle.java
@@ -1,14 +1,13 @@
-package org.dyndns.vahagn.sokoban;
+package org.vostan.sokoban;
 
 //import java.lang.Exception;
 import java.io.*;
 import static java.lang.Math.*;
 import android.util.Log;
-import android.graphics.Point;
-import java.util.Arrays;
+
 import java.util.LinkedList;
-import java.util.List;
-import static org.dyndns.vahagn.sokoban.App.TAG;
+
+import static org.vostan.sokoban.App.TAG;
 
 public class Puzzle
 {
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/PuzzleContainer.java b/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
similarity index 92%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/PuzzleContainer.java
rename to app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
index a9cb00e..3852f10 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/PuzzleContainer.java
+++ b/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
@@ -1,9 +1,10 @@
-package org.dyndns.vahagn.sokoban;
+package org.vostan.sokoban;
 
 import java.io.InputStream;
 import java.io.IOException;
-import static org.dyndns.vahagn.sokoban.App.theApp;
-import android.util.Log;
+import static org.vostan.sokoban.App.theApp;
+
+import org.dyndns.vahagn.sokoban.R;
 
 public class PuzzleContainer
 {
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainActivity.java b/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
similarity index 81%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainActivity.java
rename to app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
index 3b69044..7ae30a9 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainActivity.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
@@ -1,32 +1,17 @@
-package org.dyndns.vahagn.sokoban.menu;
+package org.vostan.sokoban.menu;
+
+import org.vostan.sokoban.play.PlayActivity;
 
-import org.dyndns.vahagn.sokoban.play.PlayActivity;
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
 import android.view.View;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.util.TypedValue;
-import android.view.Display;
-import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.ImageView;
+
 import org.dyndns.vahagn.sokoban.R;
-import static org.dyndns.vahagn.sokoban.App.theApp;
+import static org.vostan.sokoban.App.theApp;
 
 public class MainActivity extends FragmentActivity 
 {
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainFragment.java b/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
similarity index 91%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainFragment.java
rename to app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
index c221806..99b035c 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainFragment.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.dyndns.vahagn.sokoban.menu;
+package org.vostan.sokoban.menu;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -11,7 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import static org.dyndns.vahagn.sokoban.App.theApp;
+import static org.vostan.sokoban.App.theApp;
 import org.dyndns.vahagn.sokoban.R;
 
 /**
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java b/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
similarity index 94%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java
rename to app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
index 55c74ca..5b9195c 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
@@ -2,11 +2,9 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.dyndns.vahagn.sokoban.menu;
+package org.vostan.sokoban.menu;
 
-import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -23,14 +21,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.GridView;
 import android.widget.ImageView;
-import android.widget.TextView;
+
 import org.dyndns.vahagn.sokoban.R;
-import org.dyndns.vahagn.sokoban.R;
-import static org.dyndns.vahagn.sokoban.App.theApp;
-import org.dyndns.vahagn.sokoban.play.PlayActivity;
+
+import static org.vostan.sokoban.App.theApp;
 
 /**
  *
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/play/Animator.java b/app/src/main/java/org/vostan/sokoban/play/Animator.java
similarity index 97%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/play/Animator.java
rename to app/src/main/java/org/vostan/sokoban/play/Animator.java
index d5c7b30..4d5197a 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/play/Animator.java
+++ b/app/src/main/java/org/vostan/sokoban/play/Animator.java
@@ -2,9 +2,8 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.dyndns.vahagn.sokoban.play;
+package org.vostan.sokoban.play;
 
-import org.dyndns.vahagn.sokoban.play.PuzzleView;
 import android.support.v4.view.ViewCompat;
 import java.util.LinkedList;
 
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PlayActivity.java b/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
similarity index 88%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/play/PlayActivity.java
rename to app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
index 619e37c..bf37a47 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PlayActivity.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
@@ -1,35 +1,23 @@
-package org.dyndns.vahagn.sokoban.play;
+package org.vostan.sokoban.play;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
-import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.AbsListView;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.zip.Inflater;
-import org.dyndns.vahagn.sokoban.App;
-import static org.dyndns.vahagn.sokoban.App.TAG;
-import static org.dyndns.vahagn.sokoban.App.theApp;
+
+import org.vostan.sokoban.App;
+
+import static org.vostan.sokoban.App.theApp;
 import org.dyndns.vahagn.sokoban.R;
-import org.dyndns.vahagn.sokoban.Puzzle;
-import org.dyndns.vahagn.sokoban.menu.MainActivity;
+import org.vostan.sokoban.Puzzle;
 
 public class PlayActivity extends FragmentActivity
 							implements PuzzleControl.PuzzleControlLister
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleControl.java b/app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java
similarity index 92%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleControl.java
rename to app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java
index f18ce10..2f98ea9 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleControl.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java
@@ -2,18 +2,14 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.dyndns.vahagn.sokoban.play;
+package org.vostan.sokoban.play;
 
-import org.dyndns.vahagn.sokoban.play.Animator;
-import org.dyndns.vahagn.sokoban.play.PuzzleView;
-import org.dyndns.vahagn.sokoban.play.PuzzleLogic;
 import android.content.Context;
 import android.graphics.Point;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
-import org.dyndns.vahagn.sokoban.Puzzle;
-import static org.dyndns.vahagn.sokoban.App.TAG;
+import org.vostan.sokoban.Puzzle;
 
 //import android.support.v4.view.GestureDetectorCompat;
 
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java b/app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java
similarity index 98%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java
rename to app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java
index 07eed1c..96916a0 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java
@@ -2,12 +2,11 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.dyndns.vahagn.sokoban.play;
+package org.vostan.sokoban.play;
 
 import static java.lang.Math.*;
 import java.util.Arrays;
-import org.dyndns.vahagn.sokoban.Puzzle;
-import static org.dyndns.vahagn.sokoban.App.TAG;
+import org.vostan.sokoban.Puzzle;
 
 /**
  *
diff --git a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleView.java b/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
similarity index 98%
rename from app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleView.java
rename to app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
index 3e26cb7..ed0228b 100644
--- a/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleView.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
@@ -1,4 +1,4 @@
-package org.dyndns.vahagn.sokoban.play;
+package org.vostan.sokoban.play;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -12,9 +12,9 @@ import android.graphics.RectF;
 import android.support.v4.view.ViewCompat;
 import android.view.View;
 import static java.lang.Math.*;
-import static org.dyndns.vahagn.sokoban.App.TAG;
-import org.dyndns.vahagn.sokoban.Puzzle;
-import static org.dyndns.vahagn.sokoban.Puzzle.*;
+
+import org.vostan.sokoban.Puzzle;
+import static org.vostan.sokoban.Puzzle.*;
 import org.dyndns.vahagn.sokoban.R;
 
 /**