diff --git a/.classpath b/.classpath
deleted file mode 100644
index ebd5145..0000000
--- a/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<classpath>
-    <classpathentry kind="src" path="src/java"/>
-    <classpathentry kind="src" path="src/groovy"/>
-    <classpathentry kind="src" path="grails-app/conf"/>
-    <classpathentry kind="src" path="grails-app/controllers"/>
-    <classpathentry kind="src" path="grails-app/domain"/>
-    <classpathentry kind="src" path="grails-app/services"/>
-    <classpathentry kind="src" path="grails-app/taglib"/>
-    <classpathentry kind="src" path="test/integration"/>
-    <classpathentry kind="src" path="test/unit"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="com.springsource.sts.grails.core.CLASSPATH_CONTAINER"/>
-    <classpathentry kind="output" path="web-app/WEB-INF/classes"/>
-</classpath>
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..23016bd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+.classpath
+.project
+.idea/**
+.gradle/**
+.build/**
+build/**
+.settings/*
+plugins/**
+build.gradle.save
+/plugin.xml
+*.iml
+stacktrace.log
+target/**
+target-eclipse/**
+*.zip*
diff --git a/.project b/.project
deleted file mode 100644
index 939029e..0000000
--- a/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>excel-import</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-	    <nature>com.springsource.sts.grails.core.nature</nature>
-		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/org.codehaus.groovy.eclipse.preferences.prefs b/.settings/org.codehaus.groovy.eclipse.preferences.prefs
deleted file mode 100644
index bf339c7..0000000
--- a/.settings/org.codehaus.groovy.eclipse.preferences.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Created by grails
-eclipse.preferences.version=1
-groovy.dont.generate.class.files=true
diff --git a/application.properties b/application.properties
deleted file mode 100644
index 49ff20b..0000000
--- a/application.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Grails Metadata file
-#Thu May 22 11:19:27 CEST 2014
-app.grails.version=2.3.7
-app.name=excel-import
-app.servlet.version=2.5
-plugins.joda-time=1.3.1
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..068e49f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,74 @@
+buildscript {
+    ext {
+        grailsVersion = project.grailsVersion
+    }
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+    }
+}
+
+version "0.1"
+group "grails.excel.import"
+
+apply plugin:"eclipse"
+apply plugin:"idea"
+apply plugin:"org.grails.grails-plugin"
+apply plugin:"org.grails.grails-plugin-publish"
+apply plugin:"org.grails.grails-gsp"
+
+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 "org.grails.plugins:scaffolding"
+    console "org.grails:grails-console"
+    profile "org.grails.profiles:web-plugin:3.1.4"
+    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"
+    compile "org.grails.plugins:joda-time:2.0.0"
+
+    // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
+    compile "org.apache.poi:poi:3.8";
+    
+    //xlxs file support
+    compile ("org.apache.poi:poi-ooxml:3.8") {
+        exclude module: 'xmlbeans'
+    }
+    compile files('libs/xmlbeans-2.3.0-without-w3c.jar')
+    runtime "org.grails.plugins:hibernate4:5.0.3"
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = gradleWrapperVersion
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..b6709f3
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+grailsVersion=3.1.4
+gradleWrapperVersion=2.9
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..3869368
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Nov 27 23:09:32 CET 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.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..aec9973
--- /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 c4d6260..0000000
--- a/grails-app/conf/BuildConfig.groovy
+++ /dev/null
@@ -1,46 +0,0 @@
-grails.project.class.dir = "target/classes"
-grails.project.test.class.dir = "target/test-classes"
-grails.project.test.reports.dir = "target/test-reports"
-//grails.project.war.file = "target/${appName}-${appVersion}.war"
-grails.project.dependency.resolution = {
-	// inherit Grails' default dependencies
-	inherits("global") {
-		// uncomment to disable ehcache
-		// excludes 'ehcache'
-	}
-
-	log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
-	repositories {
-		grailsPlugins()
-		grailsHome()
-
-		// uncomment the below to enable remote dependency resolution
-		// from public Maven repositories
-		mavenLocal()
-		mavenCentral()
-		//mavenRepo "http://snapshots.repository.codehaus.org"
-		//mavenRepo "http://repository.codehaus.org"
-		//mavenRepo "http://download.java.net/maven/2/"
-		//mavenRepo "http://repository.jboss.com/maven2/"
-	}
-
-	dependencies {
-		// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
-		compile(group: 'org.apache.poi', name: 'poi', version: '3.8');
-		//xlxs file support
-		compile(group: 'org.apache.poi', name: 'poi-ooxml', version: '3.8') {
-			excludes 'xmlbeans'
-		}
-		//compile group:'org.apache.poi', name:'poi-contrib', version:'3.7'
-		//compile group:'org.apache.poi', name:'poi-scratchpad', version:'3.7' //ppt, word, visio, outlook support
-	}
-
-	plugins {
-		build ":release:3.0.1"
-		build ":tomcat:7.0.53"
-
-		compile ':hibernate:3.6.10.15' {
-			export = false
-		}
-	}
-}
diff --git a/grails-app/conf/application.groovy b/grails-app/conf/application.groovy
new file mode 100644
index 0000000..ed1f57e
--- /dev/null
+++ b/grails-app/conf/application.groovy
@@ -0,0 +1,22 @@
+grails{
+    profile = 'web-plugin'
+    codegen{
+        defaultPackage = 'grails.excel.import'
+    }
+}
+
+info{
+    app{
+        name = '@info.app.name@'
+        version = '@info.app.version@'
+        grailsVersion = '@info.app.grailsVersion@'
+    }
+}
+
+spring {
+    groovy{
+        template {
+            checkTemplateLocation = false
+        }
+    }
+}
\ No newline at end of file
diff --git a/grails-app/init/grails/excelimport/Application.groovy b/grails-app/init/grails/excelimport/Application.groovy
new file mode 100644
index 0000000..c86ed20
--- /dev/null
+++ b/grails-app/init/grails/excelimport/Application.groovy
@@ -0,0 +1,10 @@
+package grails.excelimport
+
+import grails.boot.GrailsApp
+import grails.boot.config.GrailsAutoConfiguration
+
+class Application extends GrailsAutoConfiguration {
+    static void main(String[] args) {
+        GrailsApp.run(Application, args)
+    }
+}
\ No newline at end of file
diff --git a/grails-app/views/error.gsp b/grails-app/views/error.gsp
new file mode 100644
index 0000000..9a3bb8a
--- /dev/null
+++ b/grails-app/views/error.gsp
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+    <head>
+        <title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
+        <meta name="layout" content="main">
+        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
+    </head>
+    <body>
+        <g:if env="development">
+            <g:if test="${Throwable.isInstance(exception)}">
+                <g:renderException exception="${exception}" />
+            </g:if>
+            <g:elseif test="${request.getAttribute('javax.servlet.error.exception')}">
+                <g:renderException exception="${request.getAttribute('javax.servlet.error.exception')}" />
+            </g:elseif>
+            <g:else>
+                <ul class="errors">
+                    <li>An error has occurred</li>
+                    <li>Exception: ${exception}</li>
+                    <li>Message: ${message}</li>
+                    <li>Path: ${path}</li>
+                </ul>
+            </g:else>
+        </g:if>
+        <g:else>
+            <ul class="errors">
+                <li>An error has occurred</li>
+            </ul>
+        </g:else>
+    </body>
+</html>
diff --git a/grails-app/views/index.gsp b/grails-app/views/index.gsp
new file mode 100644
index 0000000..7dda996
--- /dev/null
+++ b/grails-app/views/index.gsp
@@ -0,0 +1,79 @@
+<!doctype html>
+<html>
+<head>
+    <meta name="layout" content="main"/>
+    <title>Welcome to Grails</title>
+
+    <asset:link rel="icon" href="favicon.ico" type="image/x-ico" />
+</head>
+<body>
+    <content tag="nav">
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Application Status <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="#">Environment: ${grails.util.Environment.current.name}</a></li>
+                <li><a href="#">App profile: ${grailsApplication.config.grails?.profile}</a></li>
+                <li><a href="#">App version:
+                    <g:meta name="info.app.version"/></a>
+                </li>
+                <li role="separator" class="divider"></li>
+                <li><a href="#">Grails version:
+                    <g:meta name="info.app.grailsVersion"/></a>
+                </li>
+                <li><a href="#">Groovy version: ${GroovySystem.getVersion()}</a></li>
+                <li><a href="#">JVM version: ${System.getProperty('java.version')}</a></li>
+                <li role="separator" class="divider"></li>
+                <li><a href="#">Reloading active: ${grails.util.Environment.reloadingAgentEnabled}</a></li>
+            </ul>
+        </li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Artefacts <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="#">Controllers: ${grailsApplication.controllerClasses.size()}</a></li>
+                <li><a href="#">Domains: ${grailsApplication.domainClasses.size()}</a></li>
+                <li><a href="#">Services: ${grailsApplication.serviceClasses.size()}</a></li>
+                <li><a href="#">Tag Libraries: ${grailsApplication.tagLibClasses.size()}</a></li>
+            </ul>
+        </li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Installed Plugins <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <g:each var="plugin" in="${applicationContext.getBean('pluginManager').allPlugins}">
+                    <li><a href="#">${plugin.name} - ${plugin.version}</a></li>
+                </g:each>
+            </ul>
+        </li>
+    </content>
+
+    <div class="svg" role="presentation">
+        <div class="grails-logo-container">
+            <asset:image src="grails-cupsonly-logo-white.svg" class="grails-logo"/>
+        </div>
+    </div>
+
+    <div id="content" role="main">
+        <section class="row colset-2-its">
+            <h1>Welcome to Grails</h1>
+
+            <p>
+                Congratulations, you have successfully started your first Grails application! At the moment
+                this is the default page, feel free to modify it to either redirect to a controller or display
+                whatever content you may choose. Below is a list of controllers that are currently deployed in
+                this application, click on each to execute its default action:
+            </p>
+
+            <div id="controllers" role="navigation">
+                <h2>Available Controllers:</h2>
+                <ul>
+                    <g:each var="c" in="${grailsApplication.controllerClasses.sort { it.fullName } }">
+                        <li class="controller">
+                            <g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link>
+                        </li>
+                    </g:each>
+                </ul>
+            </div>
+        </section>
+    </div>
+
+</body>
+</html>
diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp
new file mode 100644
index 0000000..753706a
--- /dev/null
+++ b/grails-app/views/layouts/main.gsp
@@ -0,0 +1,51 @@
+<!doctype html>
+<html lang="en" class="no-js">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <title>
+        <g:layoutTitle default="Grails"/>
+    </title>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+    <asset:stylesheet src="application.css"/>
+
+    <g:layoutHead/>
+</head>
+<body>
+
+    <div class="navbar navbar-default navbar-static-top" role="navigation">
+        <div class="container">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="/#">
+                    <i class="fa grails-icon">
+                        <asset:image src="grails-cupsonly-logo-white.svg"/>
+                    </i> Grails
+                </a>
+            </div>
+            <div class="navbar-collapse collapse" aria-expanded="false" style="height: 0.8px;">
+                <ul class="nav navbar-nav navbar-right">
+                    <g:pageProperty name="page.nav" />
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <g:layoutBody/>
+
+    <div class="footer" role="contentinfo"></div>
+
+    <div id="spinner" class="spinner" style="display:none;">
+        <g:message code="spinner.alt" default="Loading&hellip;"/>
+    </div>
+
+    <asset:javascript src="application.js"/>
+
+</body>
+</html>
diff --git a/grails-app/views/notFound.gsp b/grails-app/views/notFound.gsp
new file mode 100644
index 0000000..4c873ba
--- /dev/null
+++ b/grails-app/views/notFound.gsp
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Page Not Found</title>
+        <meta name="layout" content="main">
+        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
+    </head>
+    <body>
+        <ul class="errors">
+            <li>Error: Page Not Found (404)</li>
+            <li>Path: ${request.forwardURI}</li>
+        </ul>
+    </body>
+</html>
diff --git a/plugin.xml b/plugin.xml
deleted file mode 100644
index 840ddd9..0000000
--- a/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<plugin name='excel-import' version='1.0.1' grailsVersion='2.0.0 &gt; *'>
-  <author>Jean Barmash, Oleksiy Symonenko</author>
-  <authorEmail>Jean.Barmash@gmail.com</authorEmail>
-  <title>Excel, Excel 2007 &amp; CSV Importer Using Apache POI</title>
-  <description>\
-	Excel-Import plugin uses Apache POI [http://poi.apache.org/] library (v 3.6) to parse Excel files.  
-      	It's useful for either bootstrapping data, or when you want to allow your users to enter some data using Excel spreadsheets. 
-</description>
-  <documentation>http://grails.org/plugin/excel-import</documentation>
-  <type>ExcelImportGrailsPlugin</type>
-  <resources>
-    <resource>org.grails.plugins.excelimport.ExcelImportService</resource>
-  </resources>
-</plugin>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..c4f7d3c
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'excel-import'
\ No newline at end of file
diff --git a/ExcelImportGrailsPlugin.groovy b/src/main/groovy/grails/excelimport/ExcelImportGrailsPlugin.groovy
similarity index 97%
rename from ExcelImportGrailsPlugin.groovy
rename to src/main/groovy/grails/excelimport/ExcelImportGrailsPlugin.groovy
index 313f301..0fa7560 100644
--- a/ExcelImportGrailsPlugin.groovy
+++ b/src/main/groovy/grails/excelimport/ExcelImportGrailsPlugin.groovy
@@ -1,6 +1,8 @@
+package grails.excelimport
+
 class ExcelImportGrailsPlugin {
     // the plugin version
-    def version = "1.0.1"
+    def version = "2.0-SNAPSHOT"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "2.0.0 > *"
     // the other plugins this plugin depends on
diff --git a/src/groovy/imexporter/AbstractImexporter.groovy b/src/main/groovy/groovy/imexporter/AbstractImexporter.groovy
similarity index 100%
rename from src/groovy/imexporter/AbstractImexporter.groovy
rename to src/main/groovy/groovy/imexporter/AbstractImexporter.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/AbstractCsvImporter.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/AbstractCsvImporter.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/AbstractCsvImporter.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/AbstractCsvImporter.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/AbstractExcelImporter.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/AbstractExcelImporter.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/AbstractExcelImporter.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/AbstractExcelImporter.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/DefaultImportCellCollector.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/DefaultImportCellCollector.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/DefaultImportCellCollector.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/DefaultImportCellCollector.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/ExpectedPropertyType.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/ExpectedPropertyType.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/ExpectedPropertyType.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/ExpectedPropertyType.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/HorizontalExcelImporter.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/HorizontalExcelImporter.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/HorizontalExcelImporter.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/HorizontalExcelImporter.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/ImportCellCollector.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/ImportCellCollector.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/ImportCellCollector.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/ImportCellCollector.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/ImportSeverityMappingEnum.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/ImportSeverityMappingEnum.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/ImportSeverityMappingEnum.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/ImportSeverityMappingEnum.groovy
diff --git a/src/groovy/org/grails/plugins/excelimport/NoopImportCellCollector.groovy b/src/main/groovy/groovy/org/grails/plugins/excelimport/NoopImportCellCollector.groovy
similarity index 100%
rename from src/groovy/org/grails/plugins/excelimport/NoopImportCellCollector.groovy
rename to src/main/groovy/groovy/org/grails/plugins/excelimport/NoopImportCellCollector.groovy
diff --git a/scripts/_Install.groovy b/src/main/scripts/_Install.groovy
similarity index 100%
rename from scripts/_Install.groovy
rename to src/main/scripts/_Install.groovy
diff --git a/scripts/_Uninstall.groovy b/src/main/scripts/_Uninstall.groovy
similarity index 100%
rename from scripts/_Uninstall.groovy
rename to src/main/scripts/_Uninstall.groovy
diff --git a/scripts/_Upgrade.groovy b/src/main/scripts/_Upgrade.groovy
similarity index 100%
rename from scripts/_Upgrade.groovy
rename to src/main/scripts/_Upgrade.groovy
diff --git a/web-app/WEB-INF/tld/c.tld b/src/main/webapp/WEB-INF/tld/c.tld
similarity index 99%
rename from web-app/WEB-INF/tld/c.tld
rename to src/main/webapp/WEB-INF/tld/c.tld
index 5e18236..4c9ccb2 100644
--- a/web-app/WEB-INF/tld/c.tld
+++ b/src/main/webapp/WEB-INF/tld/c.tld
@@ -569,4 +569,4 @@ body content should be processed.
     </attribute>
   </tag>
 
-</taglib>
+</taglib>
\ No newline at end of file
diff --git a/web-app/WEB-INF/tld/fmt.tld b/src/main/webapp/WEB-INF/tld/fmt.tld
similarity index 99%
rename from web-app/WEB-INF/tld/fmt.tld
rename to src/main/webapp/WEB-INF/tld/fmt.tld
index 2ae4776..f8ca0a4 100644
--- a/web-app/WEB-INF/tld/fmt.tld
+++ b/src/main/webapp/WEB-INF/tld/fmt.tld
@@ -668,4 +668,4 @@ Scope of var.
     </attribute>
   </tag>
 
-</taglib>
+</taglib>
\ No newline at end of file
diff --git a/test/projects/sample/application.properties b/src/test/projects/sample/application.properties
similarity index 100%
rename from test/projects/sample/application.properties
rename to src/test/projects/sample/application.properties
diff --git a/test/projects/sample/cobertura.ser b/src/test/projects/sample/cobertura.ser
similarity index 100%
rename from test/projects/sample/cobertura.ser
rename to src/test/projects/sample/cobertura.ser
diff --git a/test/projects/sample/grails-app/conf/BootStrap.groovy b/src/test/projects/sample/grails-app/conf/BootStrap.groovy
similarity index 100%
rename from test/projects/sample/grails-app/conf/BootStrap.groovy
rename to src/test/projects/sample/grails-app/conf/BootStrap.groovy
diff --git a/test/projects/sample/grails-app/conf/BuildConfig.groovy b/src/test/projects/sample/grails-app/conf/BuildConfig.groovy
similarity index 100%
rename from test/projects/sample/grails-app/conf/BuildConfig.groovy
rename to src/test/projects/sample/grails-app/conf/BuildConfig.groovy
diff --git a/test/projects/sample/grails-app/conf/Config.groovy b/src/test/projects/sample/grails-app/conf/Config.groovy
similarity index 100%
rename from test/projects/sample/grails-app/conf/Config.groovy
rename to src/test/projects/sample/grails-app/conf/Config.groovy
diff --git a/test/projects/sample/grails-app/conf/DataSource.groovy b/src/test/projects/sample/grails-app/conf/DataSource.groovy
similarity index 100%
rename from test/projects/sample/grails-app/conf/DataSource.groovy
rename to src/test/projects/sample/grails-app/conf/DataSource.groovy
diff --git a/test/projects/sample/grails-app/conf/UrlMappings.groovy b/src/test/projects/sample/grails-app/conf/UrlMappings.groovy
similarity index 100%
rename from test/projects/sample/grails-app/conf/UrlMappings.groovy
rename to src/test/projects/sample/grails-app/conf/UrlMappings.groovy
diff --git a/test/projects/sample/grails-app/conf/spring/resources.groovy b/src/test/projects/sample/grails-app/conf/spring/resources.groovy
similarity index 100%
rename from test/projects/sample/grails-app/conf/spring/resources.groovy
rename to src/test/projects/sample/grails-app/conf/spring/resources.groovy
diff --git a/test/projects/sample/grails-app/controllers/sample/BookController.groovy b/src/test/projects/sample/grails-app/controllers/sample/BookController.groovy
similarity index 100%
rename from test/projects/sample/grails-app/controllers/sample/BookController.groovy
rename to src/test/projects/sample/grails-app/controllers/sample/BookController.groovy
diff --git a/test/projects/sample/grails-app/domain/sample/Book.groovy b/src/test/projects/sample/grails-app/domain/sample/Book.groovy
similarity index 100%
rename from test/projects/sample/grails-app/domain/sample/Book.groovy
rename to src/test/projects/sample/grails-app/domain/sample/Book.groovy
diff --git a/test/projects/sample/grails-app/i18n/messages.properties b/src/test/projects/sample/grails-app/i18n/messages.properties
similarity index 100%
rename from test/projects/sample/grails-app/i18n/messages.properties
rename to src/test/projects/sample/grails-app/i18n/messages.properties
diff --git a/test/projects/sample/grails-app/views/error.gsp b/src/test/projects/sample/grails-app/views/error.gsp
similarity index 100%
rename from test/projects/sample/grails-app/views/error.gsp
rename to src/test/projects/sample/grails-app/views/error.gsp
diff --git a/test/projects/sample/grails-app/views/index.gsp b/src/test/projects/sample/grails-app/views/index.gsp
similarity index 100%
rename from test/projects/sample/grails-app/views/index.gsp
rename to src/test/projects/sample/grails-app/views/index.gsp
diff --git a/test/projects/sample/grails-app/views/layouts/main.gsp b/src/test/projects/sample/grails-app/views/layouts/main.gsp
similarity index 100%
rename from test/projects/sample/grails-app/views/layouts/main.gsp
rename to src/test/projects/sample/grails-app/views/layouts/main.gsp
diff --git a/test/projects/sample/reports/bg_gradient.gif b/src/test/projects/sample/reports/bg_gradient.gif
similarity index 100%
rename from test/projects/sample/reports/bg_gradient.gif
rename to src/test/projects/sample/reports/bg_gradient.gif
diff --git a/test/projects/sample/reports/codenarc.xslt b/src/test/projects/sample/reports/codenarc.xslt
similarity index 100%
rename from test/projects/sample/reports/codenarc.xslt
rename to src/test/projects/sample/reports/codenarc.xslt
diff --git a/test/projects/sample/reports/default.css b/src/test/projects/sample/reports/default.css
similarity index 100%
rename from test/projects/sample/reports/default.css
rename to src/test/projects/sample/reports/default.css
diff --git a/test/projects/sample/reports/gmetrics.xslt b/src/test/projects/sample/reports/gmetrics.xslt
similarity index 100%
rename from test/projects/sample/reports/gmetrics.xslt
rename to src/test/projects/sample/reports/gmetrics.xslt
diff --git a/test/projects/sample/reports/logo.gif b/src/test/projects/sample/reports/logo.gif
similarity index 100%
rename from test/projects/sample/reports/logo.gif
rename to src/test/projects/sample/reports/logo.gif
diff --git a/test/projects/sample/reports/row_bg.png b/src/test/projects/sample/reports/row_bg.png
similarity index 100%
rename from test/projects/sample/reports/row_bg.png
rename to src/test/projects/sample/reports/row_bg.png
diff --git a/test/projects/sample/scripts/CodeReports.groovy b/src/test/projects/sample/scripts/CodeReports.groovy
similarity index 100%
rename from test/projects/sample/scripts/CodeReports.groovy
rename to src/test/projects/sample/scripts/CodeReports.groovy
diff --git a/test/projects/sample/src/groovy/sample/BookExcelImporter.groovy b/src/test/projects/sample/src/groovy/sample/BookExcelImporter.groovy
similarity index 100%
rename from test/projects/sample/src/groovy/sample/BookExcelImporter.groovy
rename to src/test/projects/sample/src/groovy/sample/BookExcelImporter.groovy
diff --git a/test/projects/sample/test-data/books-empty.xls b/src/test/projects/sample/test-data/books-empty.xls
similarity index 100%
rename from test/projects/sample/test-data/books-empty.xls
rename to src/test/projects/sample/test-data/books-empty.xls
diff --git a/test/projects/sample/test-data/books-empty.xlsx b/src/test/projects/sample/test-data/books-empty.xlsx
similarity index 100%
rename from test/projects/sample/test-data/books-empty.xlsx
rename to src/test/projects/sample/test-data/books-empty.xlsx
diff --git a/test/projects/sample/test-data/books.csv b/src/test/projects/sample/test-data/books.csv
similarity index 100%
rename from test/projects/sample/test-data/books.csv
rename to src/test/projects/sample/test-data/books.csv
diff --git a/test/projects/sample/test-data/books.xls b/src/test/projects/sample/test-data/books.xls
similarity index 100%
rename from test/projects/sample/test-data/books.xls
rename to src/test/projects/sample/test-data/books.xls
diff --git a/test/projects/sample/test-data/books.xlsx b/src/test/projects/sample/test-data/books.xlsx
similarity index 100%
rename from test/projects/sample/test-data/books.xlsx
rename to src/test/projects/sample/test-data/books.xlsx
diff --git a/test/projects/sample/test-data/books.xml.xlsx b/src/test/projects/sample/test-data/books.xml.xlsx
similarity index 100%
rename from test/projects/sample/test-data/books.xml.xlsx
rename to src/test/projects/sample/test-data/books.xml.xlsx
diff --git a/test/projects/sample/test-data/books_one.csv b/src/test/projects/sample/test-data/books_one.csv
similarity index 100%
rename from test/projects/sample/test-data/books_one.csv
rename to src/test/projects/sample/test-data/books_one.csv
diff --git a/test/projects/sample/test/integration/sample/BookSpec.groovy b/src/test/projects/sample/test/integration/sample/BookSpec.groovy
similarity index 100%
rename from test/projects/sample/test/integration/sample/BookSpec.groovy
rename to src/test/projects/sample/test/integration/sample/BookSpec.groovy
diff --git a/test/projects/sample/test/integration/sample/BookTests.groovy b/src/test/projects/sample/test/integration/sample/BookTests.groovy
similarity index 100%
rename from test/projects/sample/test/integration/sample/BookTests.groovy
rename to src/test/projects/sample/test/integration/sample/BookTests.groovy
diff --git a/test/projects/sample/test/report-templates/bg_gradient.gif b/src/test/projects/sample/test/report-templates/bg_gradient.gif
similarity index 100%
rename from test/projects/sample/test/report-templates/bg_gradient.gif
rename to src/test/projects/sample/test/report-templates/bg_gradient.gif
diff --git a/test/projects/sample/test/report-templates/codenarc.xslt b/src/test/projects/sample/test/report-templates/codenarc.xslt
similarity index 100%
rename from test/projects/sample/test/report-templates/codenarc.xslt
rename to src/test/projects/sample/test/report-templates/codenarc.xslt
diff --git a/test/projects/sample/test/report-templates/default.css b/src/test/projects/sample/test/report-templates/default.css
similarity index 100%
rename from test/projects/sample/test/report-templates/default.css
rename to src/test/projects/sample/test/report-templates/default.css
diff --git a/test/projects/sample/test/report-templates/gmetrics.xslt b/src/test/projects/sample/test/report-templates/gmetrics.xslt
similarity index 100%
rename from test/projects/sample/test/report-templates/gmetrics.xslt
rename to src/test/projects/sample/test/report-templates/gmetrics.xslt
diff --git a/test/projects/sample/test/report-templates/logo.gif b/src/test/projects/sample/test/report-templates/logo.gif
similarity index 100%
rename from test/projects/sample/test/report-templates/logo.gif
rename to src/test/projects/sample/test/report-templates/logo.gif
diff --git a/test/projects/sample/test/report-templates/row_bg.png b/src/test/projects/sample/test/report-templates/row_bg.png
similarity index 100%
rename from test/projects/sample/test/report-templates/row_bg.png
rename to src/test/projects/sample/test/report-templates/row_bg.png
diff --git a/test/projects/sample/web-app/WEB-INF/applicationContext.xml b/src/test/projects/sample/web-app/WEB-INF/applicationContext.xml
similarity index 100%
rename from test/projects/sample/web-app/WEB-INF/applicationContext.xml
rename to src/test/projects/sample/web-app/WEB-INF/applicationContext.xml
diff --git a/test/projects/sample/web-app/WEB-INF/sitemesh.xml b/src/test/projects/sample/web-app/WEB-INF/sitemesh.xml
similarity index 100%
rename from test/projects/sample/web-app/WEB-INF/sitemesh.xml
rename to src/test/projects/sample/web-app/WEB-INF/sitemesh.xml
diff --git a/test/projects/sample/web-app/WEB-INF/tld/c.tld b/src/test/projects/sample/web-app/WEB-INF/tld/c.tld
similarity index 100%
rename from test/projects/sample/web-app/WEB-INF/tld/c.tld
rename to src/test/projects/sample/web-app/WEB-INF/tld/c.tld
diff --git a/test/projects/sample/web-app/WEB-INF/tld/fmt.tld b/src/test/projects/sample/web-app/WEB-INF/tld/fmt.tld
similarity index 100%
rename from test/projects/sample/web-app/WEB-INF/tld/fmt.tld
rename to src/test/projects/sample/web-app/WEB-INF/tld/fmt.tld
diff --git a/test/projects/sample/web-app/WEB-INF/tld/grails.tld b/src/test/projects/sample/web-app/WEB-INF/tld/grails.tld
similarity index 100%
rename from test/projects/sample/web-app/WEB-INF/tld/grails.tld
rename to src/test/projects/sample/web-app/WEB-INF/tld/grails.tld
diff --git a/test/projects/sample/web-app/WEB-INF/tld/spring.tld b/src/test/projects/sample/web-app/WEB-INF/tld/spring.tld
similarity index 100%
rename from test/projects/sample/web-app/WEB-INF/tld/spring.tld
rename to src/test/projects/sample/web-app/WEB-INF/tld/spring.tld
diff --git a/test/projects/sample/web-app/css/errors.css b/src/test/projects/sample/web-app/css/errors.css
similarity index 100%
rename from test/projects/sample/web-app/css/errors.css
rename to src/test/projects/sample/web-app/css/errors.css
diff --git a/test/projects/sample/web-app/css/main.css b/src/test/projects/sample/web-app/css/main.css
similarity index 100%
rename from test/projects/sample/web-app/css/main.css
rename to src/test/projects/sample/web-app/css/main.css
diff --git a/test/projects/sample/web-app/css/mobile.css b/src/test/projects/sample/web-app/css/mobile.css
similarity index 100%
rename from test/projects/sample/web-app/css/mobile.css
rename to src/test/projects/sample/web-app/css/mobile.css
diff --git a/test/projects/sample/web-app/images/apple-touch-icon-retina.png b/src/test/projects/sample/web-app/images/apple-touch-icon-retina.png
similarity index 100%
rename from test/projects/sample/web-app/images/apple-touch-icon-retina.png
rename to src/test/projects/sample/web-app/images/apple-touch-icon-retina.png
diff --git a/test/projects/sample/web-app/images/apple-touch-icon.png b/src/test/projects/sample/web-app/images/apple-touch-icon.png
similarity index 100%
rename from test/projects/sample/web-app/images/apple-touch-icon.png
rename to src/test/projects/sample/web-app/images/apple-touch-icon.png
diff --git a/test/projects/sample/web-app/images/favicon.ico b/src/test/projects/sample/web-app/images/favicon.ico
similarity index 100%
rename from test/projects/sample/web-app/images/favicon.ico
rename to src/test/projects/sample/web-app/images/favicon.ico
diff --git a/test/projects/sample/web-app/images/grails_logo.jpg b/src/test/projects/sample/web-app/images/grails_logo.jpg
similarity index 100%
rename from test/projects/sample/web-app/images/grails_logo.jpg
rename to src/test/projects/sample/web-app/images/grails_logo.jpg
diff --git a/test/projects/sample/web-app/images/grails_logo.png b/src/test/projects/sample/web-app/images/grails_logo.png
similarity index 100%
rename from test/projects/sample/web-app/images/grails_logo.png
rename to src/test/projects/sample/web-app/images/grails_logo.png
diff --git a/test/projects/sample/web-app/images/leftnav_btm.png b/src/test/projects/sample/web-app/images/leftnav_btm.png
similarity index 100%
rename from test/projects/sample/web-app/images/leftnav_btm.png
rename to src/test/projects/sample/web-app/images/leftnav_btm.png
diff --git a/test/projects/sample/web-app/images/leftnav_midstretch.png b/src/test/projects/sample/web-app/images/leftnav_midstretch.png
similarity index 100%
rename from test/projects/sample/web-app/images/leftnav_midstretch.png
rename to src/test/projects/sample/web-app/images/leftnav_midstretch.png
diff --git a/test/projects/sample/web-app/images/leftnav_top.png b/src/test/projects/sample/web-app/images/leftnav_top.png
similarity index 100%
rename from test/projects/sample/web-app/images/leftnav_top.png
rename to src/test/projects/sample/web-app/images/leftnav_top.png
diff --git a/test/projects/sample/web-app/images/skin/database_add.png b/src/test/projects/sample/web-app/images/skin/database_add.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/database_add.png
rename to src/test/projects/sample/web-app/images/skin/database_add.png
diff --git a/test/projects/sample/web-app/images/skin/database_delete.png b/src/test/projects/sample/web-app/images/skin/database_delete.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/database_delete.png
rename to src/test/projects/sample/web-app/images/skin/database_delete.png
diff --git a/test/projects/sample/web-app/images/skin/database_edit.png b/src/test/projects/sample/web-app/images/skin/database_edit.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/database_edit.png
rename to src/test/projects/sample/web-app/images/skin/database_edit.png
diff --git a/test/projects/sample/web-app/images/skin/database_save.png b/src/test/projects/sample/web-app/images/skin/database_save.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/database_save.png
rename to src/test/projects/sample/web-app/images/skin/database_save.png
diff --git a/test/projects/sample/web-app/images/skin/database_table.png b/src/test/projects/sample/web-app/images/skin/database_table.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/database_table.png
rename to src/test/projects/sample/web-app/images/skin/database_table.png
diff --git a/test/projects/sample/web-app/images/skin/exclamation.png b/src/test/projects/sample/web-app/images/skin/exclamation.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/exclamation.png
rename to src/test/projects/sample/web-app/images/skin/exclamation.png
diff --git a/test/projects/sample/web-app/images/skin/house.png b/src/test/projects/sample/web-app/images/skin/house.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/house.png
rename to src/test/projects/sample/web-app/images/skin/house.png
diff --git a/test/projects/sample/web-app/images/skin/information.png b/src/test/projects/sample/web-app/images/skin/information.png
similarity index 100%
rename from test/projects/sample/web-app/images/skin/information.png
rename to src/test/projects/sample/web-app/images/skin/information.png
diff --git a/test/projects/sample/web-app/images/skin/shadow.jpg b/src/test/projects/sample/web-app/images/skin/shadow.jpg
similarity index 100%
rename from test/projects/sample/web-app/images/skin/shadow.jpg
rename to src/test/projects/sample/web-app/images/skin/shadow.jpg
diff --git a/test/projects/sample/web-app/images/skin/sorted_asc.gif b/src/test/projects/sample/web-app/images/skin/sorted_asc.gif
similarity index 100%
rename from test/projects/sample/web-app/images/skin/sorted_asc.gif
rename to src/test/projects/sample/web-app/images/skin/sorted_asc.gif
diff --git a/test/projects/sample/web-app/images/skin/sorted_desc.gif b/src/test/projects/sample/web-app/images/skin/sorted_desc.gif
similarity index 100%
rename from test/projects/sample/web-app/images/skin/sorted_desc.gif
rename to src/test/projects/sample/web-app/images/skin/sorted_desc.gif
diff --git a/test/projects/sample/web-app/images/spinner.gif b/src/test/projects/sample/web-app/images/spinner.gif
similarity index 100%
rename from test/projects/sample/web-app/images/spinner.gif
rename to src/test/projects/sample/web-app/images/spinner.gif
diff --git a/test/projects/sample/web-app/images/springsource.png b/src/test/projects/sample/web-app/images/springsource.png
similarity index 100%
rename from test/projects/sample/web-app/images/springsource.png
rename to src/test/projects/sample/web-app/images/springsource.png
diff --git a/test/projects/sample/web-app/js/application.js b/src/test/projects/sample/web-app/js/application.js
similarity index 100%
rename from test/projects/sample/web-app/js/application.js
rename to src/test/projects/sample/web-app/js/application.js
diff --git a/test/projects/sample/web-app/js/prototype/animation.js b/src/test/projects/sample/web-app/js/prototype/animation.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/animation.js
rename to src/test/projects/sample/web-app/js/prototype/animation.js
diff --git a/test/projects/sample/web-app/js/prototype/builder.js b/src/test/projects/sample/web-app/js/prototype/builder.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/builder.js
rename to src/test/projects/sample/web-app/js/prototype/builder.js
diff --git a/test/projects/sample/web-app/js/prototype/controls.js b/src/test/projects/sample/web-app/js/prototype/controls.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/controls.js
rename to src/test/projects/sample/web-app/js/prototype/controls.js
diff --git a/test/projects/sample/web-app/js/prototype/dragdrop.js b/src/test/projects/sample/web-app/js/prototype/dragdrop.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/dragdrop.js
rename to src/test/projects/sample/web-app/js/prototype/dragdrop.js
diff --git a/test/projects/sample/web-app/js/prototype/effects.js b/src/test/projects/sample/web-app/js/prototype/effects.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/effects.js
rename to src/test/projects/sample/web-app/js/prototype/effects.js
diff --git a/test/projects/sample/web-app/js/prototype/prototype.js b/src/test/projects/sample/web-app/js/prototype/prototype.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/prototype.js
rename to src/test/projects/sample/web-app/js/prototype/prototype.js
diff --git a/test/projects/sample/web-app/js/prototype/rico.js b/src/test/projects/sample/web-app/js/prototype/rico.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/rico.js
rename to src/test/projects/sample/web-app/js/prototype/rico.js
diff --git a/test/projects/sample/web-app/js/prototype/scriptaculous.js b/src/test/projects/sample/web-app/js/prototype/scriptaculous.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/scriptaculous.js
rename to src/test/projects/sample/web-app/js/prototype/scriptaculous.js
diff --git a/test/projects/sample/web-app/js/prototype/slider.js b/src/test/projects/sample/web-app/js/prototype/slider.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/slider.js
rename to src/test/projects/sample/web-app/js/prototype/slider.js
diff --git a/test/projects/sample/web-app/js/prototype/sound.js b/src/test/projects/sample/web-app/js/prototype/sound.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/sound.js
rename to src/test/projects/sample/web-app/js/prototype/sound.js
diff --git a/test/projects/sample/web-app/js/prototype/unittest.js b/src/test/projects/sample/web-app/js/prototype/unittest.js
similarity index 100%
rename from test/projects/sample/web-app/js/prototype/unittest.js
rename to src/test/projects/sample/web-app/js/prototype/unittest.js
diff --git a/test/report-templates/bg_gradient.gif b/src/test/report-templates/bg_gradient.gif
similarity index 100%
rename from test/report-templates/bg_gradient.gif
rename to src/test/report-templates/bg_gradient.gif
diff --git a/test/report-templates/codenarc.xslt b/src/test/report-templates/codenarc.xslt
similarity index 100%
rename from test/report-templates/codenarc.xslt
rename to src/test/report-templates/codenarc.xslt
diff --git a/test/report-templates/default.css b/src/test/report-templates/default.css
similarity index 100%
rename from test/report-templates/default.css
rename to src/test/report-templates/default.css
diff --git a/test/report-templates/gmetrics.xslt b/src/test/report-templates/gmetrics.xslt
similarity index 100%
rename from test/report-templates/gmetrics.xslt
rename to src/test/report-templates/gmetrics.xslt
diff --git a/test/report-templates/logo.gif b/src/test/report-templates/logo.gif
similarity index 100%
rename from test/report-templates/logo.gif
rename to src/test/report-templates/logo.gif
diff --git a/test/report-templates/row_bg.png b/src/test/report-templates/row_bg.png
similarity index 100%
rename from test/report-templates/row_bg.png
rename to src/test/report-templates/row_bg.png
diff --git a/test/projects/sample/.classpath b/test/projects/sample/.classpath
deleted file mode 100644
index ebd5145..0000000
--- a/test/projects/sample/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<classpath>
-    <classpathentry kind="src" path="src/java"/>
-    <classpathentry kind="src" path="src/groovy"/>
-    <classpathentry kind="src" path="grails-app/conf"/>
-    <classpathentry kind="src" path="grails-app/controllers"/>
-    <classpathentry kind="src" path="grails-app/domain"/>
-    <classpathentry kind="src" path="grails-app/services"/>
-    <classpathentry kind="src" path="grails-app/taglib"/>
-    <classpathentry kind="src" path="test/integration"/>
-    <classpathentry kind="src" path="test/unit"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="com.springsource.sts.grails.core.CLASSPATH_CONTAINER"/>
-    <classpathentry kind="output" path="web-app/WEB-INF/classes"/>
-</classpath>
\ No newline at end of file
diff --git a/test/projects/sample/.project b/test/projects/sample/.project
deleted file mode 100644
index 6cb8b94..0000000
--- a/test/projects/sample/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sample</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-	    <nature>com.springsource.sts.grails.core.nature</nature>
-		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/test/projects/sample/.settings/org.codehaus.groovy.eclipse.preferences.prefs b/test/projects/sample/.settings/org.codehaus.groovy.eclipse.preferences.prefs
deleted file mode 100644
index bf339c7..0000000
--- a/test/projects/sample/.settings/org.codehaus.groovy.eclipse.preferences.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Created by grails
-eclipse.preferences.version=1
-groovy.dont.generate.class.files=true