diff --git a/.gitignore b/.gitignore
index 9fe187b..5b46c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,19 @@
 .settings
+.gradle
+.idea
 bin
 gen
 arch
 nbandroid
 private
+build
 res/values/version.xml
 compiler/compiler.obj
 compiler/compiler.exe
 compiler/test/compiler.exe
 compiler/puzzles.bin
+local.properties
+import-summary.txt
 
 *.swp
 
diff --git a/ant.properties b/ant.properties
deleted file mode 100644
index 4973139..0000000
--- a/ant.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-key.store=C:/Users/vahagnk/devel/_private/org.dyndns.vahagn.keystore
-key.alias=dyndns
diff --git a/app/app.iml b/app/app.iml
new file mode 100644
index 0000000..c07a1e8
--- /dev/null
+++ b/app/app.iml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="org.vostan.sokoban" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <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" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 10 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
+  </component>
+</module>
+
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..b95e484
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 10
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        applicationId "org.dyndns.vahagn.sokoban"
+        minSdkVersion 10
+        targetSdkVersion 14
+    }
+
+    buildTypes {
+        release {
+            runProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:18.0.0'
+}
diff --git a/proguard-project.txt b/app/proguard-project.txt
similarity index 100%
rename from proguard-project.txt
rename to app/proguard-project.txt
diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/src/org/dyndns/vahagn/sokoban/App.java b/app/src/main/java/org/dyndns/vahagn/sokoban/App.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/App.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/App.java
diff --git a/src/org/dyndns/vahagn/sokoban/Puzzle.java b/app/src/main/java/org/dyndns/vahagn/sokoban/Puzzle.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/Puzzle.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/Puzzle.java
diff --git a/src/org/dyndns/vahagn/sokoban/PuzzleContainer.java b/app/src/main/java/org/dyndns/vahagn/sokoban/PuzzleContainer.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/PuzzleContainer.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/PuzzleContainer.java
diff --git a/src/org/dyndns/vahagn/sokoban/menu/MainActivity.java b/app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainActivity.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/menu/MainActivity.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainActivity.java
diff --git a/src/org/dyndns/vahagn/sokoban/menu/MainFragment.java b/app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainFragment.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/menu/MainFragment.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainFragment.java
diff --git a/src/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java b/app/src/main/java/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java
diff --git a/src/org/dyndns/vahagn/sokoban/play/Animator.java b/app/src/main/java/org/dyndns/vahagn/sokoban/play/Animator.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/play/Animator.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/play/Animator.java
diff --git a/src/org/dyndns/vahagn/sokoban/play/PlayActivity.java b/app/src/main/java/org/dyndns/vahagn/sokoban/play/PlayActivity.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/play/PlayActivity.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/play/PlayActivity.java
diff --git a/src/org/dyndns/vahagn/sokoban/play/PuzzleControl.java b/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleControl.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/play/PuzzleControl.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleControl.java
diff --git a/src/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java b/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java
diff --git a/src/org/dyndns/vahagn/sokoban/play/PuzzleView.java b/app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleView.java
similarity index 100%
rename from src/org/dyndns/vahagn/sokoban/play/PuzzleView.java
rename to app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleView.java
diff --git a/res/animator/fragment_slide_left_enter.xml b/app/src/main/res/animator/fragment_slide_left_enter.xml
similarity index 100%
rename from res/animator/fragment_slide_left_enter.xml
rename to app/src/main/res/animator/fragment_slide_left_enter.xml
diff --git a/res/animator/fragment_slide_left_exit.xml b/app/src/main/res/animator/fragment_slide_left_exit.xml
similarity index 100%
rename from res/animator/fragment_slide_left_exit.xml
rename to app/src/main/res/animator/fragment_slide_left_exit.xml
diff --git a/res/animator/fragment_slide_right_enter.xml b/app/src/main/res/animator/fragment_slide_right_enter.xml
similarity index 100%
rename from res/animator/fragment_slide_right_enter.xml
rename to app/src/main/res/animator/fragment_slide_right_enter.xml
diff --git a/res/animator/fragment_slide_right_exit.xml b/app/src/main/res/animator/fragment_slide_right_exit.xml
similarity index 100%
rename from res/animator/fragment_slide_right_exit.xml
rename to app/src/main/res/animator/fragment_slide_right_exit.xml
diff --git a/res/animator/puzzle_action_bar_enter.xml b/app/src/main/res/animator/puzzle_action_bar_enter.xml
similarity index 100%
rename from res/animator/puzzle_action_bar_enter.xml
rename to app/src/main/res/animator/puzzle_action_bar_enter.xml
diff --git a/res/animator/puzzle_action_bar_exit.xml b/app/src/main/res/animator/puzzle_action_bar_exit.xml
similarity index 100%
rename from res/animator/puzzle_action_bar_exit.xml
rename to app/src/main/res/animator/puzzle_action_bar_exit.xml
diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to app/src/main/res/drawable-hdpi/icon.png
diff --git a/res/drawable-hdpi/icon_debug.png b/app/src/main/res/drawable-hdpi/icon_debug.png
similarity index 100%
rename from res/drawable-hdpi/icon_debug.png
rename to app/src/main/res/drawable-hdpi/icon_debug.png
diff --git a/res/drawable-hdpi/next.png b/app/src/main/res/drawable-hdpi/next.png
similarity index 100%
rename from res/drawable-hdpi/next.png
rename to app/src/main/res/drawable-hdpi/next.png
diff --git a/res/drawable-hdpi/prev.png b/app/src/main/res/drawable-hdpi/prev.png
similarity index 100%
rename from res/drawable-hdpi/prev.png
rename to app/src/main/res/drawable-hdpi/prev.png
diff --git a/res/drawable-hdpi/reset.png b/app/src/main/res/drawable-hdpi/reset.png
similarity index 100%
rename from res/drawable-hdpi/reset.png
rename to app/src/main/res/drawable-hdpi/reset.png
diff --git a/res/drawable-hdpi/undo.png b/app/src/main/res/drawable-hdpi/undo.png
similarity index 100%
rename from res/drawable-hdpi/undo.png
rename to app/src/main/res/drawable-hdpi/undo.png
diff --git a/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from res/drawable-ldpi/icon.png
rename to app/src/main/res/drawable-ldpi/icon.png
diff --git a/res/drawable-ldpi/icon_debug.png b/app/src/main/res/drawable-ldpi/icon_debug.png
similarity index 100%
rename from res/drawable-ldpi/icon_debug.png
rename to app/src/main/res/drawable-ldpi/icon_debug.png
diff --git a/res/drawable-ldpi/next.png b/app/src/main/res/drawable-ldpi/next.png
similarity index 100%
rename from res/drawable-ldpi/next.png
rename to app/src/main/res/drawable-ldpi/next.png
diff --git a/res/drawable-ldpi/prev.png b/app/src/main/res/drawable-ldpi/prev.png
similarity index 100%
rename from res/drawable-ldpi/prev.png
rename to app/src/main/res/drawable-ldpi/prev.png
diff --git a/res/drawable-ldpi/reset.png b/app/src/main/res/drawable-ldpi/reset.png
similarity index 100%
rename from res/drawable-ldpi/reset.png
rename to app/src/main/res/drawable-ldpi/reset.png
diff --git a/res/drawable-ldpi/undo.png b/app/src/main/res/drawable-ldpi/undo.png
similarity index 100%
rename from res/drawable-ldpi/undo.png
rename to app/src/main/res/drawable-ldpi/undo.png
diff --git a/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to app/src/main/res/drawable-mdpi/icon.png
diff --git a/res/drawable-mdpi/icon_debug.png b/app/src/main/res/drawable-mdpi/icon_debug.png
similarity index 100%
rename from res/drawable-mdpi/icon_debug.png
rename to app/src/main/res/drawable-mdpi/icon_debug.png
diff --git a/res/drawable-mdpi/next.png b/app/src/main/res/drawable-mdpi/next.png
similarity index 100%
rename from res/drawable-mdpi/next.png
rename to app/src/main/res/drawable-mdpi/next.png
diff --git a/res/drawable-mdpi/prev.png b/app/src/main/res/drawable-mdpi/prev.png
similarity index 100%
rename from res/drawable-mdpi/prev.png
rename to app/src/main/res/drawable-mdpi/prev.png
diff --git a/res/drawable-mdpi/reset.png b/app/src/main/res/drawable-mdpi/reset.png
similarity index 100%
rename from res/drawable-mdpi/reset.png
rename to app/src/main/res/drawable-mdpi/reset.png
diff --git a/res/drawable-mdpi/undo.png b/app/src/main/res/drawable-mdpi/undo.png
similarity index 100%
rename from res/drawable-mdpi/undo.png
rename to app/src/main/res/drawable-mdpi/undo.png
diff --git a/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from res/drawable-xhdpi/icon.png
rename to app/src/main/res/drawable-xhdpi/icon.png
diff --git a/res/drawable-xhdpi/icon_debug.png b/app/src/main/res/drawable-xhdpi/icon_debug.png
similarity index 100%
rename from res/drawable-xhdpi/icon_debug.png
rename to app/src/main/res/drawable-xhdpi/icon_debug.png
diff --git a/res/drawable-xhdpi/next.png b/app/src/main/res/drawable-xhdpi/next.png
similarity index 100%
rename from res/drawable-xhdpi/next.png
rename to app/src/main/res/drawable-xhdpi/next.png
diff --git a/res/drawable-xhdpi/prev.png b/app/src/main/res/drawable-xhdpi/prev.png
similarity index 100%
rename from res/drawable-xhdpi/prev.png
rename to app/src/main/res/drawable-xhdpi/prev.png
diff --git a/res/drawable-xhdpi/reset.png b/app/src/main/res/drawable-xhdpi/reset.png
similarity index 100%
rename from res/drawable-xhdpi/reset.png
rename to app/src/main/res/drawable-xhdpi/reset.png
diff --git a/res/drawable-xhdpi/undo.png b/app/src/main/res/drawable-xhdpi/undo.png
similarity index 100%
rename from res/drawable-xhdpi/undo.png
rename to app/src/main/res/drawable-xhdpi/undo.png
diff --git a/res/drawable/bingo.png b/app/src/main/res/drawable/bingo.png
similarity index 100%
rename from res/drawable/bingo.png
rename to app/src/main/res/drawable/bingo.png
diff --git a/res/drawable/box.png b/app/src/main/res/drawable/box.png
similarity index 100%
rename from res/drawable/box.png
rename to app/src/main/res/drawable/box.png
diff --git a/res/drawable/floor.png b/app/src/main/res/drawable/floor.png
similarity index 100%
rename from res/drawable/floor.png
rename to app/src/main/res/drawable/floor.png
diff --git a/res/drawable/goal.png b/app/src/main/res/drawable/goal.png
similarity index 100%
rename from res/drawable/goal.png
rename to app/src/main/res/drawable/goal.png
diff --git a/res/drawable/lock.png b/app/src/main/res/drawable/lock.png
similarity index 100%
rename from res/drawable/lock.png
rename to app/src/main/res/drawable/lock.png
diff --git a/res/drawable/splash.png b/app/src/main/res/drawable/splash.png
similarity index 100%
rename from res/drawable/splash.png
rename to app/src/main/res/drawable/splash.png
diff --git a/res/drawable/unlock.png b/app/src/main/res/drawable/unlock.png
similarity index 100%
rename from res/drawable/unlock.png
rename to app/src/main/res/drawable/unlock.png
diff --git a/res/drawable/wall.png b/app/src/main/res/drawable/wall.png
similarity index 100%
rename from res/drawable/wall.png
rename to app/src/main/res/drawable/wall.png
diff --git a/res/drawable/worker.png b/app/src/main/res/drawable/worker.png
similarity index 100%
rename from res/drawable/worker.png
rename to app/src/main/res/drawable/worker.png
diff --git a/res/drawable/worker_select.png b/app/src/main/res/drawable/worker_select.png
similarity index 100%
rename from res/drawable/worker_select.png
rename to app/src/main/res/drawable/worker_select.png
diff --git a/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
similarity index 100%
rename from res/layout/main_activity.xml
rename to app/src/main/res/layout/main_activity.xml
diff --git a/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from res/layout/main_fragment.xml
rename to app/src/main/res/layout/main_fragment.xml
diff --git a/res/layout/puzzle_list_fragment.xml b/app/src/main/res/layout/puzzle_list_fragment.xml
similarity index 100%
rename from res/layout/puzzle_list_fragment.xml
rename to app/src/main/res/layout/puzzle_list_fragment.xml
diff --git a/res/layout/puzzle_view_title.xml b/app/src/main/res/layout/puzzle_view_title.xml
similarity index 100%
rename from res/layout/puzzle_view_title.xml
rename to app/src/main/res/layout/puzzle_view_title.xml
diff --git a/res/raw/puzzles.bin b/app/src/main/res/raw/puzzles.bin
similarity index 100%
rename from res/raw/puzzles.bin
rename to app/src/main/res/raw/puzzles.bin
diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..e1e1653
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.13.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/build.properties b/build.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/build.xml b/build.xml
deleted file mode 100644
index df78d36..0000000
--- a/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.dyndns.vahagn.sokoban" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/custom_rules.xml b/custom_rules.xml
deleted file mode 100644
index 145fbf1..0000000
--- a/custom_rules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="custom_rules">
-
-<target name="-pre-build">
-	<exec executable="cmd.exe" failonerror="true">
-		<arg line="/C version.bat"/>
-        <!--env key="NDK_MODULE_PATH" path="..:../native/ext"/-->
-	</exec>
-</target>
-
-</project>
diff --git a/default.properties b/default.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
deleted file mode 100644
index 65ebaf8..0000000
Binary files a/libs/android-support-v4.jar and /dev/null differ
diff --git a/local.properties b/local.properties
deleted file mode 100644
index ab8f3ad..0000000
--- a/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=C:\\Program Files (x86)\\Android\\android-sdk
diff --git a/org.vostan.sokoban.iml b/org.vostan.sokoban.iml
new file mode 100644
index 0000000..0bb6048
--- /dev/null
+++ b/org.vostan.sokoban.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 214acdd..0000000
--- a/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/version.bat b/version.bat
index eda88b4..3e246cb 100644
--- a/version.bat
+++ b/version.bat
@@ -16,7 +16,7 @@ rem
 rem
 rem	Generate res\values\version.xml for windows.
 rem
-set VERSION_XML=res\values\version.xml
+set VERSION_XML=app\src\main\res\values\version.xml
 echo on
 
 @echo ^<?xml version="1.0" encoding="utf-8"?^> > %VERSION_XML%