diff --git a/.gitignore b/.gitignore
index e0fa2ea..e98db12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 grails-*.zip
 grails-*.zip.sha1
 plugin.xml
+build
+.gradle
diff --git a/README.md b/README.md
index 9561ed3..bcfcb5c 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,5 @@ grails-quick-search
 ===================
 
 Grails plugin for quick search implementation. Supports search for domain class properties and adds utility functions and tag libraries for autocomplete functionality.
+
+Version 0.7.x of this plugin has been upgraded to Grails 3.1.x.
\ No newline at end of file
diff --git a/application.properties b/application.properties
deleted file mode 100644
index 7d148e9..0000000
--- a/application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Grails Metadata file
-#Wed Nov 13 14:56:38 CET 2013
-app.grails.version=2.3.2
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..54ce64c
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,84 @@
+buildscript {
+    ext {
+        grailsVersion = project.grailsVersion
+    }
+    repositories {
+        mavenLocal()
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+    }
+}
+
+version "0.7.1"
+group "grails.plugin"
+
+apply plugin:"eclipse"
+apply plugin:"idea"
+apply plugin:"org.grails.grails-plugin"
+apply plugin:"org.grails.grails-plugin-publish"
+
+ext {
+    grailsVersion = project.grailsVersion
+    gradleWrapperVersion = project.gradleWrapperVersion
+}
+
+repositories {
+    mavenLocal()
+    maven { url "https://repo.grails.org/grails/core" }
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.grails:grails-bom:$grailsVersion"
+    }
+    applyMavenExclusions false
+}
+
+dependencies {
+    compile "org.springframework.boot:spring-boot-starter-logging"
+    compile "org.springframework.boot:spring-boot-autoconfigure"
+    compile "org.grails:grails-core"
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile "org.springframework.boot:spring-boot-starter-tomcat"
+    compile "org.grails:grails-dependencies"
+    compile "org.grails:grails-web-boot"
+    compile "org.grails.plugins:cache"
+
+    compile group: 'org.hibernate', name: 'hibernate-core', version: '4.3.11.Final'
+    //compile "org.hibernate:hibernate-ehcache"
+    //compile 'org.grails:grails-datastore-rest-client'
+
+    compile 'org.apache.commons:commons-lang3:3.3.2'
+
+    compile "org.grails.plugins:scaffolding"
+    console "org.grails:grails-console"
+    profile "org.grails.profiles:web-plugin"
+    provided "org.grails:grails-plugin-services"
+    provided "org.grails:grails-plugin-domain-class"
+
+
+    testCompile "org.grails:grails-plugin-testing"
+    testCompile "org.grails.plugins:geb"
+    testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
+    testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
+}
+grailsPublish {
+    // TODO: Provide values here
+    user = 'user'
+    key = 'key'
+    githubSlug = 'tadodotcom/grails-quick-search'
+    license {
+        name = 'BSD'
+    }
+    title = "Quick Search Plugin"
+    desc = """
+Search plugin for domain class properties. Lightweight plugin which puts the ability for searching, it adds utility
+functions for building the search result into a string format representation sufficient for auto-complete as well as
+functions for listing the results based on the search query.
+"""
+    developers = [matouskucera: "Matouš Kučera"]
+    portalUser = ""
+    portalPassword = ""    
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..ae31dec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+grailsVersion=3.1.10
+gradleWrapperVersion=2.13
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..9411448
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..7dd7755
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Aug 24 13:53:44 PDT 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/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
+
+# 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\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+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"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # 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/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
deleted file mode 100644
index d3f614a..0000000
--- a/grails-app/conf/BuildConfig.groovy
+++ /dev/null
@@ -1,27 +0,0 @@
-grails.project.work.dir = 'target'
-
-grails.project.dependency.resolver = "maven"
-grails.project.dependency.resolution = {
-   inherits "global"
-   log "warn"
-
-   repositories {
-      grailsCentral()
-      mavenLocal()
-      mavenCentral()
-   }
-
-   dependencies {
-      compile 'org.apache.commons:commons-lang3:3.3.2'
-   }
-
-   plugins {
-      build(":release:3.1.2", ":rest-client-builder:2.1.1") {
-         export = false
-      }
-
-      compile(":hibernate:3.6.10.19") {
-         export = false
-      }
-   }
-}
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
new file mode 100644
index 0000000..c160744
--- /dev/null
+++ b/grails-app/conf/application.yml
@@ -0,0 +1,78 @@
+---
+grails:
+    profile: web-plugin
+    codegen:
+        defaultPackage: grails.plugin
+    spring:
+        transactionManagement:
+            proxies: false
+info:
+    app:
+        name: 'Quick Search Plugin'
+        version: '0.7.1'
+        grailsVersion: '3.1.10'
+spring:
+    groovy:
+        template:
+            check-template-location: false
+# Spring Actuator Endpoints are Disabled by Default
+endpoints:
+    enabled: false
+    jmx:
+        enabled: true
+
+---
+grails:
+    mime:
+        disable:
+            accept:
+                header:
+                    userAgents:
+                        - Gecko
+                        - WebKit
+                        - Presto
+                        - Trident
+        types:
+            all: '*/*'
+            atom: application/atom+xml
+            css: text/css
+            csv: text/csv
+            form: application/x-www-form-urlencoded
+            html:
+              - text/html
+              - application/xhtml+xml
+            js: text/javascript
+            json:
+              - application/json
+              - text/json
+            multipartForm: multipart/form-data
+            pdf: application/pdf
+            rss: application/rss+xml
+            text: text/plain
+            hal:
+              - application/hal+json
+              - application/hal+xml
+            xml:
+              - text/xml
+              - application/xml
+    urlmapping:
+        cache:
+            maxsize: 1000
+    controllers:
+        defaultScope: singleton
+    converters:
+        encoding: UTF-8
+    views:
+        default:
+            codec: html
+        gsp:
+            encoding: UTF-8
+            htmlcodec: xml
+            codecs:
+                expression: html
+                scriptlets: html
+                taglib: none
+                staticparts: none
+endpoints:
+    jmx:
+        unique-names: true
diff --git a/grails-app/init/grails/plugin/Application.groovy b/grails-app/init/grails/plugin/Application.groovy
new file mode 100644
index 0000000..a936f4c
--- /dev/null
+++ b/grails-app/init/grails/plugin/Application.groovy
@@ -0,0 +1,12 @@
+package grails.plugin
+
+import grails.boot.*
+import grails.boot.config.GrailsAutoConfiguration
+import grails.plugins.metadata.*
+
+@PluginSource
+class Application extends GrailsAutoConfiguration {
+    static void main(String[] args) {
+        GrailsApp.run(Application, args)
+    }
+}
\ No newline at end of file
diff --git a/grails-app/services/org/grails/plugins/quickSearch/QuickSearchService.groovy b/grails-app/services/grails/plugin/quickSearch/QuickSearchService.groovy
similarity index 97%
rename from grails-app/services/org/grails/plugins/quickSearch/QuickSearchService.groovy
rename to grails-app/services/grails/plugin/quickSearch/QuickSearchService.groovy
index aba8ca0..36273f1 100644
--- a/grails-app/services/org/grails/plugins/quickSearch/QuickSearchService.groovy
+++ b/grails-app/services/grails/plugin/quickSearch/QuickSearchService.groovy
@@ -1,9 +1,9 @@
-package org.grails.plugins.quickSearch
+package grails.plugin.quickSearch
 
+import grails.core.GrailsDomainClassProperty
 import groovy.text.SimpleTemplateEngine
 import org.apache.commons.lang.ClassUtils
-import org.codehaus.groovy.grails.commons.GrailsDomainClassProperty
-import org.hibernate.criterion.CriteriaSpecification
+import org.hibernate.sql.JoinType
 
 class QuickSearchService {
 
@@ -11,7 +11,7 @@ class QuickSearchService {
 
    def grailsApplication
 
-   private static final int ALIAS_JOIN_TYPE = CriteriaSpecification.LEFT_JOIN
+   private static final int ALIAS_JOIN_TYPE = JoinType.LEFT_OUTER_JOIN.joinTypeValue
 
    /**
     * Executes the search based on given query and properties which should be searched.
diff --git a/QuickSearchGrailsPlugin.groovy b/src/main/groovy/grails/plugin/QuickSearchGrailsPlugin.groovy
similarity index 69%
rename from QuickSearchGrailsPlugin.groovy
rename to src/main/groovy/grails/plugin/QuickSearchGrailsPlugin.groovy
index ff70528..8205244 100644
--- a/QuickSearchGrailsPlugin.groovy
+++ b/src/main/groovy/grails/plugin/QuickSearchGrailsPlugin.groovy
@@ -1,6 +1,17 @@
-class QuickSearchGrailsPlugin {
-   def version = "0.6.0"
-   def grailsVersion = "2.0 > *"
+package grails.plugin
+
+import grails.plugins.*
+
+class QuickSearchGrailsPlugin extends Plugin {
+
+   def version = "0.7.0"
+
+   // the version or versions of Grails the plugin is designed for
+   def grailsVersion = "3.1.10 > *"
+   // resources that are excluded from plugin packaging
+   def pluginExcludes = [
+           "grails-app/views/error.gsp"
+   ]
 
    def title = "Quick Search Plugin"
    def author = "Matouš Kučera"
@@ -20,4 +31,5 @@ functions for listing the results based on the search query.
    def issueManagement = [system: "Github", url: "https://github.com/tadodotcom/grails-quick-search/issues"]
 
    def scm = [url: "https://github.com/tadodotcom/grails-quick-search"]
+
 }
diff --git a/src/groovy/org/grails/plugins/quickSearch/QuickSearchUtil.groovy b/src/main/groovy/grails/plugin/quickSearch/QuickSearchUtil.groovy
similarity index 98%
rename from src/groovy/org/grails/plugins/quickSearch/QuickSearchUtil.groovy
rename to src/main/groovy/grails/plugin/quickSearch/QuickSearchUtil.groovy
index f57ac48..6f720cc 100644
--- a/src/groovy/org/grails/plugins/quickSearch/QuickSearchUtil.groovy
+++ b/src/main/groovy/grails/plugin/quickSearch/QuickSearchUtil.groovy
@@ -1,8 +1,8 @@
-package org.grails.plugins.quickSearch
+package grails.plugin.quickSearch
 
+import grails.core.GrailsDomainClass
 import org.apache.commons.lang.ClassUtils
 import org.apache.commons.logging.LogFactory
-import org.codehaus.groovy.grails.commons.GrailsDomainClass
 
 import java.text.Normalizer