diff --git a/app/app.iml b/app/app.iml
index 756b4f0..02c6fc8 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -50,13 +50,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/tests/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
diff --git a/app/build.gradle b/app/build.gradle
index b95e484..3583078 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,45 @@
 apply plugin: 'com.android.application'
 
+//
+//	Creates version.xml	
+//
+task createVersionXML {
+	doLast {
+        def versionP = 'git describe --tags --long --dirty=-x --abbrev=8'
+						.execute()
+        def version = versionP.text.trim()
+		if ( versionP.exitValue() )
+			throw new GradleException("Couldn't extract version. Git exited unexpectedly.")
+
+        def githashP = 'git rev-parse HEAD'.execute()
+        def githash = githashP.text.trim()
+		if ( githashP.exitValue() )
+			throw new GradleException("Couldn't extract git_hash. Git exited unexpectedly.")
+		
+		def builddate = new Date()
+
+	    def versionFile = new FileWriter("app/src/main/res/values/version.xml")
+		versionFile.println( '<?xml version="1.0" encoding="utf-8"?>' )
+		versionFile.println( '<resources>' )
+		versionFile.println( '<string name="git_version">' << version << '</string>' )
+		versionFile.println( '<string name="git_hash">' << githash << '</string>' )
+		versionFile.println( '<string name="builddate">' << builddate << '</string>' )
+		versionFile.println( '</resources>' )
+		versionFile.close()
+	}
+}
+preBuild.dependsOn createVersionXML
+
 android {
     compileSdkVersion 10
     buildToolsVersion "21.1.1"
 
     defaultConfig {
-        applicationId "org.dyndns.vahagn.sokoban"
+        applicationId "org.vostan.sokoban"
         minSdkVersion 10
         targetSdkVersion 14
+
+        //applicationLabel="Banvor Debug"
     }
 
     buildTypes {
@@ -15,9 +47,34 @@ android {
             runProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
         }
+
+        debug {
+            applicationIdSuffix ".debug"
+        }
+    }
+
+    sourceSets {
+        /*
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+
+            renderscript.srcDirs = ['src']
+
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+
+        }
+        */
+        androidTest.setRoot('src/tests')
     }
 }
 
+//repositories {}
+
 dependencies {
     compile 'com.android.support:support-v4:18.0.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 55e9b8c..e02136b 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="org.dyndns.vahagn.sokoban"
+      package="org.vostan.sokoban"
       android:versionCode="0x00010001"
       android:versionName="@string/git_version">
     <uses-sdk android:minSdkVersion="10" 
@@ -24,7 +24,7 @@
 					android:screenOrientation="portrait" >
 	        <meta-data
 	            android:name="android.support.PARENT_ACTIVITY"
-	            android:value="org.dyndns.vahagn.sokoban.MainMenu" />
+	            android:value="org.vostan.sokoban.MainMenu" />
         </activity>
     </application>
 </manifest> 
diff --git a/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java b/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
index 3852f10..1b39836 100644
--- a/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
+++ b/app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
@@ -4,7 +4,7 @@ import java.io.InputStream;
 import java.io.IOException;
 import static org.vostan.sokoban.App.theApp;
 
-import org.dyndns.vahagn.sokoban.R;
+import org.vostan.sokoban.R;
 
 public class PuzzleContainer
 {
diff --git a/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java b/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
index 7ae30a9..103790d 100644
--- a/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
@@ -10,7 +10,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.Window;
 
-import org.dyndns.vahagn.sokoban.R;
+import org.vostan.sokoban.R;
 import static org.vostan.sokoban.App.theApp;
 
 public class MainActivity extends FragmentActivity 
diff --git a/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java b/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
index 99b035c..9192cd5 100644
--- a/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
@@ -12,7 +12,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 import static org.vostan.sokoban.App.theApp;
-import org.dyndns.vahagn.sokoban.R;
+import org.vostan.sokoban.R;
 
 /**
  *
diff --git a/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java b/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
index 5b9195c..9f76918 100644
--- a/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
+++ b/app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
@@ -24,7 +24,7 @@ import android.widget.BaseAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
 
-import org.dyndns.vahagn.sokoban.R;
+import org.vostan.sokoban.R;
 
 import static org.vostan.sokoban.App.theApp;
 
diff --git a/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java b/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
index bf37a47..8a85e3e 100644
--- a/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
@@ -16,7 +16,7 @@ import android.widget.TextView;
 import org.vostan.sokoban.App;
 
 import static org.vostan.sokoban.App.theApp;
-import org.dyndns.vahagn.sokoban.R;
+import org.vostan.sokoban.R;
 import org.vostan.sokoban.Puzzle;
 
 public class PlayActivity extends FragmentActivity
diff --git a/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java b/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
index ed0228b..f243664 100644
--- a/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
+++ b/app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
@@ -15,7 +15,7 @@ import static java.lang.Math.*;
 
 import org.vostan.sokoban.Puzzle;
 import static org.vostan.sokoban.Puzzle.*;
-import org.dyndns.vahagn.sokoban.R;
+import org.vostan.sokoban.R;
 
 /**
  */
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a66c081..c9e1e3c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Free Sokoban</string>
-    <string name="app_name_debug">Debug Sokoban</string>
+    <string name="app_name">Banvor</string>
+    <string name="app_name_debug">Banvor Debug</string>
     <string name="menu">Menu</string>
     <string name="play_activity">play_activity</string>
     <string name="btn_start_begin">Begin</string>
diff --git a/version.bat b/version.bat
deleted file mode 100644
index 3e246cb..0000000
--- a/version.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem 
-rem	Copyright 2005-2013 Vahagn Khachatryan.
-rem
-rem	This program is free software; you can redistribute it and/or modify
-rem	it under the terms of the GNU General Public License as published by
-rem	the Free Software Foundation; either version 2 of the License, or
-rem	(at your option) any later version.
-rem
-rem	This program is distributed in the hope that it will be useful,
-rem	but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem	GNU General Public License for more details.
-rem
-
-rem
-rem	Generate res\values\version.xml for windows.
-rem
-set VERSION_XML=app\src\main\res\values\version.xml
-echo on
-
-@echo ^<?xml version="1.0" encoding="utf-8"?^> > %VERSION_XML%
-@echo ^<resources^> >> %VERSION_XML%
-@for /F "delims=" %%i in ('"git describe --tags --long --dirty=-x --abbrev=8"') do set VERSION=%%i
-echo ^<string name="git_version"^>%VERSION%^</string^> >> %VERSION_XML%
-@for /F "delims=" %%i in ('"git rev-parse HEAD"') do set GITHASH=%%i
-echo ^<string name="git_hash"^>%GITHASH%^</string^> >> %VERSION_XML%
-@for /F "delims=" %%i in ('"%USERPROFILE%\bin\date.exe -R"') do set BUILDDATE=%%i
-echo ^<string name="builddate"^>%BUILDDATE%^</string^> >> %VERSION_XML%
-@echo ^</resources^> >> %VERSION_XML%
-