diff --git a/.gitignore b/.gitignore
index 2987f04..519d73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,8 @@ out/
 .idea/
 
 #database files
-*.db
\ No newline at end of file
+*.db
+
+#gradle files
+.gradle/
+build/
diff --git a/README.md b/README.md
index 1f058b9..f15bf57 100644
--- a/README.md
+++ b/README.md
@@ -7,4 +7,9 @@ Requirements
 ------------
 - JDK8
 
+Building and run with Gradle
+----------------------------
+* Set your environment variable JAVA_HOME to the directory that contains the JDK1.8
+* gradlew run
+
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..3264274
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////////
+// plugins                                                                       //
+///////////////////////////////////////////////////////////////////////////////////
+apply plugin: 'java'
+apply plugin:'application'
+
+///////////////////////////////////////////////////////////////////////////////////
+// settings                                                                      //
+///////////////////////////////////////////////////////////////////////////////////
+version = 0.1
+sourceCompatibility = 1.8
+mainClassName = 'de.frosch95.geofrogger.fx.GeoFroggerFXMain'
+
+///////////////////////////////////////////////////////////////////////////////////
+// add main class to MANIFEST.FM                                                 //
+///////////////////////////////////////////////////////////////////////////////////
+jar {
+  manifest {
+    attributes 'Main-Class': mainClassName
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+// change the src default                                                        //
+///////////////////////////////////////////////////////////////////////////////////
+sourceSets {
+  main {
+    java {
+      srcDirs = ['src']
+    }
+    resources {
+      srcDirs = ['src']
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+// usage of maven central and sonatype repository                                //
+///////////////////////////////////////////////////////////////////////////////////
+repositories {
+  mavenCentral()
+  maven {
+    url "https://oss.sonatype.org/content/repositories/snapshots"
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+// dependecies                                                                   //
+///////////////////////////////////////////////////////////////////////////////////
+dependencies {
+  //compile group: 'org.jfxtras', name: 'jfxtras-labs', version: '8.0-r1-SNAPSHOT' this is not an actual version and the map part is missing
+  compile files('lib/JFXtras/jfxtras-labs-8.0-r1-SNAPSHOT.jar')
+  compile group: 'org.jdom', name: 'jdom2', version: '2.0.5'
+  compile group: 'org.controlsfx', name: 'controlsfx', version: '8.0.1'
+  compile group: 'com.h2database', name: 'h2', version: '1.3.173'
+  compile group: 'org.eclipse.persistence', name: 'eclipselink', version: '2.5.0'
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+// tasks                                                                         //
+///////////////////////////////////////////////////////////////////////////////////
+task wrapper(type: Wrapper) {
+  gradleVersion = '1.7'
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..b12fd56
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+jfxtras_requiredJavaFxVersion  =  8.0
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..b979729
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..3b624ba
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Sep 22 11:48:27 CEST 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip
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/lib/controlsfx/controlsfx-8.0.2-developer-preview-1-javadoc.jar b/lib/controlsfx/controlsfx-8.0.2-developer-preview-1-javadoc.jar
deleted file mode 100644
index 7b6e74f..0000000
Binary files a/lib/controlsfx/controlsfx-8.0.2-developer-preview-1-javadoc.jar and /dev/null differ
diff --git a/lib/controlsfx/controlsfx-8.0.2-developer-preview-1-samples.jar b/lib/controlsfx/controlsfx-8.0.2-developer-preview-1-samples.jar
deleted file mode 100644
index 067bbb8..0000000
Binary files a/lib/controlsfx/controlsfx-8.0.2-developer-preview-1-samples.jar and /dev/null differ
diff --git a/lib/controlsfx/controlsfx-8.0.2-developer-preview-1.jar b/lib/controlsfx/controlsfx-8.0.2-developer-preview-1.jar
deleted file mode 100644
index 0b473a6..0000000
Binary files a/lib/controlsfx/controlsfx-8.0.2-developer-preview-1.jar and /dev/null differ
diff --git a/lib/h2/h2-1.3.173.jar b/lib/h2/h2-1.3.173.jar
deleted file mode 100644
index 7c3cec3..0000000
Binary files a/lib/h2/h2-1.3.173.jar and /dev/null differ
diff --git a/lib/h2/h2.bat b/lib/h2/h2.bat
deleted file mode 100644
index e60bb5c..0000000
--- a/lib/h2/h2.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@java -cp "h2-1.3.173.jar;%H2DRIVERS%;%CLASSPATH%" org.h2.tools.Console %*
-@if errorlevel 1 pause
\ No newline at end of file
diff --git a/lib/h2/h2.sh b/lib/h2/h2.sh
deleted file mode 100644
index 697878e..0000000
--- a/lib/h2/h2.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-dir=$(dirname "$0")
-java -cp "$dir/h2-1.3.173.jar:$H2DRIVERS:$CLASSPATH" org.h2.tools.Console "$@"
diff --git a/lib/h2/h2w.bat b/lib/h2/h2w.bat
deleted file mode 100644
index 5ae9b10..0000000
--- a/lib/h2/h2w.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@start javaw -cp "h2-1.3.173.jar;%H2DRIVERS%;%CLASSPATH%" org.h2.tools.Console %*
-@if errorlevel 1 pause
\ No newline at end of file
diff --git a/lib/jdom-2/jdom-2.0.5-javadoc.jar b/lib/jdom-2/jdom-2.0.5-javadoc.jar
deleted file mode 100644
index 79f0c19..0000000
Binary files a/lib/jdom-2/jdom-2.0.5-javadoc.jar and /dev/null differ
diff --git a/lib/jdom-2/jdom-2.0.5-sources.jar b/lib/jdom-2/jdom-2.0.5-sources.jar
deleted file mode 100644
index 7ccbe80..0000000
Binary files a/lib/jdom-2/jdom-2.0.5-sources.jar and /dev/null differ
diff --git a/lib/jdom-2/jdom-2.0.5.jar b/lib/jdom-2/jdom-2.0.5.jar
deleted file mode 100644
index b6996c7..0000000
Binary files a/lib/jdom-2/jdom-2.0.5.jar and /dev/null differ