diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..6c74d7f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,54 @@
+apply plugin: 'war'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compileOnly "javax.servlet:javax.servlet-api:4.0.1"
+    compileOnly "javax.ws.rs:javax.ws.rs-api:2.1.1"
+
+    implementation "org.apache.commons:commons-configuration2:2.9.0"
+    implementation "org.apache.commons:commons-lang3:3.12.0"
+    implementation "commons-net:commons-net:3.9.0"
+    implementation "commons-beanutils:commons-beanutils:1.9.4"
+
+    implementation "org.apache.ant:ant:1.10.13"
+    implementation "org.apache.ant:ant-nodeps:1.8.1"
+    implementation "org.apache.ant:ant-jsch:1.10.13"
+    implementation "org.apache.ant:ant-commons-net:1.10.13"
+    implementation "org.apache.ant:ant-javamail:1.10.13"
+    implementation "org.apache.ant:ant-launcher:1.10.13"
+
+    implementation "org.apache.commons:commons-jcs-core:2.2.1"
+
+    implementation "org.quartz-scheduler:quartz:2.3.2"
+
+    implementation "org.apache.logging.log4j:log4j-core:2.20.0"
+    implementation "org.apache.logging.log4j:log4j-web:2.20.0"
+    implementation "org.apache.logging.log4j:log4j-1.2-api:2.20.0"
+    implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0"
+
+    implementation "org.apache.ws.commons.axiom:axiom:1.2.22"
+    implementation "org.apache.ws.commons.axiom:axiom-impl:1.2.22"
+
+    implementation "org.apache.shiro:shiro-core:1.12.0"
+    implementation "org.apache.shiro:shiro-root:1.12.0"
+    implementation "org.apache.shiro:shiro-web:1.12.0"
+
+    implementation "org.apache.cxf:cxf:3.6.1"
+    implementation "org.apache.cxf:cxf-rt-databinding-aegis:3.6.1"
+    runtimeOnly "org.apache.cxf:cxf-rt-transports-http:3.6.1"
+    runtimeOnly "org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.1"
+    runtimeOnly "org.apache.cxf:cxf-rt-frontend-jaxws:3.6.1"
+    runtimeOnly "org.apache.cxf:cxf-rt-security:3.6.1"
+
+
+    implementation "rhino:js:1.7R2"
+
+    implementation "org.springframework:spring-core:5.3.29"
+    implementation "org.springframework:spring-context:5.3.29"
+    implementation "org.springframework:spring-web:5.3.29"
+
+    implementation fileTree(dir: "lib/", includes: ["*.jar"])
+}
\ 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..033e24c
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..62f495d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..fcb6fca
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+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
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..6689b85
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+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 execute
+
+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
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 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!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ivy.xml b/ivy.xml
deleted file mode 100644
index 7b48f36..0000000
--- a/ivy.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
-<ivy-module version="2.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
-	<info organisation="Brutex Network" module="XServices" status="integration">
-	</info>
-
-	<configurations >
-
-		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
-		<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
-		<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths." extends="master"/>
-		<conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-		<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
-		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
-		<conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
-		<conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
-		<conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
-		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
-	</configurations>
-
-	
-
-	<dependencies defaultconf="master">
-    
-		<dependency org="org.apache.commons" name="commons-lang3" rev="3.7"/>
-		<dependency org="org.apache.commons" name="commons-configuration2" rev="2.7" />
-
-		<dependency org="commons-net" name="commons-net" rev="3.2"/>
-	
-		<dependency org="org.apache.ant" name="ant" rev="1.8.4"/>
-		<dependency org="org.apache.ant" name="ant-nodeps" rev="1.8.1"/>
-		<dependency org="org.apache.ant" name="ant-jsch" rev="1.8.4"/>
-		<!--<dependency org="ant-contrib" name="ant-contrib" rev="20020829"/>-->
-		<dependency org="org.apache.ant" name="ant-commons-net" rev="1.8.4"/>
-		<dependency org="javax.mail" name="mail" rev="1.4.7"/>
-		<dependency org="org.apache.ant" name="ant-javamail" rev="1.8.1"/>
-		<dependency org="org.apache.ant" name="ant-launcher" rev="1.8.4"/>
-		
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-core -->
-		<dependency org="org.apache.commons" name="commons-jcs-core" rev="2.2"/>
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-jcache -->
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-jcs-jcache-extras -->
-		<!--<dependency org="org.apache.commons" name="commons-jcs-jcache" rev="2.2"/>
-		<dependency org="org.apache.commons" name="commons-jcs-jcache-extras" rev="2.2"/>-->
-
-		
-		
-		<dependency org="org.quartz-scheduler" name="quartz" rev="2.3.0"/>
-            
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
-		<dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.17.1"/>
-		<dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.17.1"/>
-		<dependency org="org.apache.logging.log4j" name="log4j-web" rev="2.17.1"/>
-		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api -->
-		<dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.17.1"/>
-
-		
-		<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
-		<dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="2.17.1"           />
-		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
-	<!--	<dependency org="org.slf4j" name="slf4j-api" rev="1.7.25" />-->
-		
-
-		
-		<dependency org="org.springframework" name="spring-core" rev="5.0.5.RELEASE" conf="master,compile,runtime"/>		
-		<dependency org="org.springframework" name="spring-context" rev="5.0.5.RELEASE" conf="master,compile,runtime"/>	
-		<dependency org="org.springframework" name="spring-web" rev="5.0.5.RELEASE" conf="master,compile,runtime"/>	
-		
-	
-		<dependency org="commons-beanutils" name="commons-beanutils" rev="1.9.3"/>
-
-		<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
-		<dependency org="javax.servlet" name="javax.servlet-api" rev="4.0.1"/>
-
-
-
-		<dependency org="org.apache.ws.commons.axiom" name="axiom-api" rev="1.2.20" conf="compile,master">
-		<!--	<artifact name="axiom-api" ext="jar"/>-->
-			<exclude name="axiom-api-1.2.20-tests" ext="jar"/>
-		</dependency>
-		<dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.20" conf="master" />		
-		
-        
-        <!--
-		<dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="4.4.1"/>
-		<dependency org="org.codehaus.woodstox" name="stax2-api" rev="4.1"/>
--->
-        
-		
-		
-	    <dependency org="org.apache.shiro" name="shiro-core" rev="1.8.0"  />
-	    <dependency org="org.apache.shiro" name="shiro-root" rev="1.8.0"  />
-        <dependency org="org.apache.shiro" name="shiro-web" rev="1.8.0" />
-
-        
-            
-        <dependency org="org.apache.cxf" name="cxf-core" rev="3.2.4" conf="master,compile"/>
-        <dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="3.2.4" conf="master,compile" />
-        <dependency org="org.apache.cxf" name="cxf-rt-databinding-aegis" rev="3.2.4" conf="master,compile"/>
-        <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="3.2.4" conf="master,compile"/>
-        <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="3.2.4" conf="master,compile"/>
-        <dependency org="org.apache.cxf" name="cxf-rt-security" rev="3.2.4" conf="master,compile"/>
-		<dependency org="org.apache.cxf" name="cxf-rt-ws-security" rev="3.2.4" conf="master,compile"/>
-
-<!--
-		<dependency org="org.apache.wss4j" name="wss4j" rev="2.2.1" conf="*->compile"/>
-		<dependency org="org.apache.wss4j" name="wss4j-ws-security-common" rev="2.2.1" conf="*->compile"/>
-	-->
-		<dependency org="org.apache.ws.security" name="wss4j" rev="1.6.19"/>
-
-
-		
-
-		                       
-   		<dependency org="rhino" name="js" rev="1.7R2"/>	
-   		
-   		
-   		<!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
-		<dependency org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1"/>
-   		
-   		
-		
-		<!-- 
-			Locally managed libraries
-		-->
-		<dependency org="lib" name="java-unrar" rev="0.3" conf="*->default">
-			<artifact name="java-unrar" type="jar" />
-		</dependency>
-		<dependency org="lib" name="lib.cvsclient" rev="20131001" conf="*->default">
-			<artifact name="lib.cvsclient" type="jar" />
-		</dependency>
-		<dependency org="lib" name="lib.xservices-scmtypes" rev="20131001" conf="*->default">
-			<artifact name="lib.xservices-scmtypes" type="jar" />
-		</dependency>
-		<dependency org="lib" name="MgmtDataModel" rev="20131001" conf="*->default">
-			<artifact name="MgmtDataModel" type="jar" />
-		</dependency>
-		<!--
-		<dependency org="lib" name="OADocGenerator" rev="20131001" conf="*->default">
-			<artifact name="OADocGenerator" type="jar" />
-		</dependency>
-		-->
-		<dependency org="lib" name="DocBuilder" rev="20131001" conf="*->default">
-			<artifact name="DocBuilder" type="jar" />
-		</dependency>
-
-		<!-- Micro Focus/ Serena Software Dimensions CM 14.1 API -->
-		<dependency org="lib" name="serena.darius" rev="14.1" conf="*->default">
-			<artifact name="serena.darius" type="jar" />
-		</dependency>
-		<dependency org="lib" name="serena.dmclient" rev="14.1" conf="*->default">
-			<artifact name="serena.dmclient" type="jar" />
-		</dependency>
-		<dependency org="lib" name="serena.dmfile" rev="14.1" conf="*->default">
-			<artifact name="serena.dmfile" type="jar" />
-		</dependency>
-		<dependency org="lib" name="serena.dmnet" rev="14.1" conf="*->default">
-			<artifact name="serena.dmnet" type="jar" />
-		</dependency>
-		<dependency org="lib" name="serena.dmtpi" rev="14.1" conf="*->default">
-			<artifact name="serena.dmtpi" type="jar" />
-		</dependency>
-
-		<conflict manager="latest-revision"/>
-	</dependencies>
-</ivy-module>
diff --git a/ivysettings.xml b/ivysettings.xml
deleted file mode 100644
index f49f353..0000000
--- a/ivysettings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivysettings>
-	<settings defaultResolver="defaultchain" />
-	<resolvers>
-		<ibiblio name="apache-maven" m2compatible="true" usepoms="true"	root="https://repo.maven.apache.org/maven2/" />
-		<ibiblio name="java" m2compatible="true" usepoms="true" root="http://download.java.net/maven/2/" />
-
-		<filesystem name="local-filesystem">
-			<!-- <ivy pattern="${ivy.settings.dir}/1/[organisation]/[module]/ivys/ivy-[revision].xml"/> -->
-			<artifact pattern="${ivy.settings.dir}/lib/[artifact]-[revision].[ext]" />
-		</filesystem>
-
-		<chain name="defaultchain">
-			<resolver ref="local-filesystem" />
-			<resolver ref="apache-maven" />
-			<resolver ref="java" />
-
-		</chain>
-	</resolvers>
-
-	<modules>
-		<module organisation="javax.transaction" resolver="java" />
-		<module organisation="javax.sql" resolver="java" />
-	</modules>
-</ivysettings>
-
diff --git a/src/java/net/brutex/xservices/cmtypes/ItemType.java b/src/main/java/net/brutex/xservices/cmtypes/ItemType.java
similarity index 100%
rename from src/java/net/brutex/xservices/cmtypes/ItemType.java
rename to src/main/java/net/brutex/xservices/cmtypes/ItemType.java
diff --git a/src/java/net/brutex/xservices/cmtypes/ItemTypeList.java b/src/main/java/net/brutex/xservices/cmtypes/ItemTypeList.java
similarity index 100%
rename from src/java/net/brutex/xservices/cmtypes/ItemTypeList.java
rename to src/main/java/net/brutex/xservices/cmtypes/ItemTypeList.java
diff --git a/src/java/net/brutex/xservices/security/DirectoryPermission.java b/src/main/java/net/brutex/xservices/security/DirectoryPermission.java
similarity index 100%
rename from src/java/net/brutex/xservices/security/DirectoryPermission.java
rename to src/main/java/net/brutex/xservices/security/DirectoryPermission.java
diff --git a/src/java/net/brutex/xservices/security/PermissionResolver.java b/src/main/java/net/brutex/xservices/security/PermissionResolver.java
similarity index 100%
rename from src/java/net/brutex/xservices/security/PermissionResolver.java
rename to src/main/java/net/brutex/xservices/security/PermissionResolver.java
diff --git a/src/java/net/brutex/xservices/security/XServicesRealm.java b/src/main/java/net/brutex/xservices/security/XServicesRealm.java
similarity index 100%
rename from src/java/net/brutex/xservices/security/XServicesRealm.java
rename to src/main/java/net/brutex/xservices/security/XServicesRealm.java
diff --git a/src/java/net/brutex/xservices/security/XmlServicePermission.java b/src/main/java/net/brutex/xservices/security/XmlServicePermission.java
similarity index 100%
rename from src/java/net/brutex/xservices/security/XmlServicePermission.java
rename to src/main/java/net/brutex/xservices/security/XmlServicePermission.java
diff --git a/src/java/net/brutex/xservices/types/AttributeType.java b/src/main/java/net/brutex/xservices/types/AttributeType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/AttributeType.java
rename to src/main/java/net/brutex/xservices/types/AttributeType.java
diff --git a/src/java/net/brutex/xservices/types/CompressionType.java b/src/main/java/net/brutex/xservices/types/CompressionType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/CompressionType.java
rename to src/main/java/net/brutex/xservices/types/CompressionType.java
diff --git a/src/java/net/brutex/xservices/types/DateFormatType.java b/src/main/java/net/brutex/xservices/types/DateFormatType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/DateFormatType.java
rename to src/main/java/net/brutex/xservices/types/DateFormatType.java
diff --git a/src/java/net/brutex/xservices/types/DateInfoExtendedType.java b/src/main/java/net/brutex/xservices/types/DateInfoExtendedType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/DateInfoExtendedType.java
rename to src/main/java/net/brutex/xservices/types/DateInfoExtendedType.java
diff --git a/src/java/net/brutex/xservices/types/DateInfoType.java b/src/main/java/net/brutex/xservices/types/DateInfoType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/DateInfoType.java
rename to src/main/java/net/brutex/xservices/types/DateInfoType.java
diff --git a/src/java/net/brutex/xservices/types/DateTimeUnits.java b/src/main/java/net/brutex/xservices/types/DateTimeUnits.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/DateTimeUnits.java
rename to src/main/java/net/brutex/xservices/types/DateTimeUnits.java
diff --git a/src/java/net/brutex/xservices/types/FileInfoType.java b/src/main/java/net/brutex/xservices/types/FileInfoType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/FileInfoType.java
rename to src/main/java/net/brutex/xservices/types/FileInfoType.java
diff --git a/src/java/net/brutex/xservices/types/HostConnection.java b/src/main/java/net/brutex/xservices/types/HostConnection.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/HostConnection.java
rename to src/main/java/net/brutex/xservices/types/HostConnection.java
diff --git a/src/java/net/brutex/xservices/types/HostinfoType.java b/src/main/java/net/brutex/xservices/types/HostinfoType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/HostinfoType.java
rename to src/main/java/net/brutex/xservices/types/HostinfoType.java
diff --git a/src/java/net/brutex/xservices/types/MailMimeType.java b/src/main/java/net/brutex/xservices/types/MailMimeType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/MailMimeType.java
rename to src/main/java/net/brutex/xservices/types/MailMimeType.java
diff --git a/src/java/net/brutex/xservices/types/NamespaceListType.java b/src/main/java/net/brutex/xservices/types/NamespaceListType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/NamespaceListType.java
rename to src/main/java/net/brutex/xservices/types/NamespaceListType.java
diff --git a/src/java/net/brutex/xservices/types/NamespaceType.java b/src/main/java/net/brutex/xservices/types/NamespaceType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/NamespaceType.java
rename to src/main/java/net/brutex/xservices/types/NamespaceType.java
diff --git a/src/java/net/brutex/xservices/types/ReplacePattern.java b/src/main/java/net/brutex/xservices/types/ReplacePattern.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ReplacePattern.java
rename to src/main/java/net/brutex/xservices/types/ReplacePattern.java
diff --git a/src/java/net/brutex/xservices/types/ReturnCode.java b/src/main/java/net/brutex/xservices/types/ReturnCode.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ReturnCode.java
rename to src/main/java/net/brutex/xservices/types/ReturnCode.java
diff --git a/src/java/net/brutex/xservices/types/RuntimeInfoType.java b/src/main/java/net/brutex/xservices/types/RuntimeInfoType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/RuntimeInfoType.java
rename to src/main/java/net/brutex/xservices/types/RuntimeInfoType.java
diff --git a/src/java/net/brutex/xservices/types/ScheduledJob.java b/src/main/java/net/brutex/xservices/types/ScheduledJob.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ScheduledJob.java
rename to src/main/java/net/brutex/xservices/types/ScheduledJob.java
diff --git a/src/java/net/brutex/xservices/types/StringMatchDetails.java b/src/main/java/net/brutex/xservices/types/StringMatchDetails.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/StringMatchDetails.java
rename to src/main/java/net/brutex/xservices/types/StringMatchDetails.java
diff --git a/src/java/net/brutex/xservices/types/StringMatchType.java b/src/main/java/net/brutex/xservices/types/StringMatchType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/StringMatchType.java
rename to src/main/java/net/brutex/xservices/types/StringMatchType.java
diff --git a/src/java/net/brutex/xservices/types/StringReplaceType.java b/src/main/java/net/brutex/xservices/types/StringReplaceType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/StringReplaceType.java
rename to src/main/java/net/brutex/xservices/types/StringReplaceType.java
diff --git a/src/java/net/brutex/xservices/types/StringSplitType.java b/src/main/java/net/brutex/xservices/types/StringSplitType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/StringSplitType.java
rename to src/main/java/net/brutex/xservices/types/StringSplitType.java
diff --git a/src/java/net/brutex/xservices/types/TargetNodeType.java b/src/main/java/net/brutex/xservices/types/TargetNodeType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/TargetNodeType.java
rename to src/main/java/net/brutex/xservices/types/TargetNodeType.java
diff --git a/src/java/net/brutex/xservices/types/TimeZoneType.java b/src/main/java/net/brutex/xservices/types/TimeZoneType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/TimeZoneType.java
rename to src/main/java/net/brutex/xservices/types/TimeZoneType.java
diff --git a/src/java/net/brutex/xservices/types/ant/AntProperty.java b/src/main/java/net/brutex/xservices/types/ant/AntProperty.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/AntProperty.java
rename to src/main/java/net/brutex/xservices/types/ant/AntProperty.java
diff --git a/src/java/net/brutex/xservices/types/ant/ArchiveResource.java b/src/main/java/net/brutex/xservices/types/ant/ArchiveResource.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/ArchiveResource.java
rename to src/main/java/net/brutex/xservices/types/ant/ArchiveResource.java
diff --git a/src/java/net/brutex/xservices/types/ant/AttachmentType.java b/src/main/java/net/brutex/xservices/types/ant/AttachmentType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/AttachmentType.java
rename to src/main/java/net/brutex/xservices/types/ant/AttachmentType.java
diff --git a/src/java/net/brutex/xservices/types/ant/CollectionType.java b/src/main/java/net/brutex/xservices/types/ant/CollectionType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/CollectionType.java
rename to src/main/java/net/brutex/xservices/types/ant/CollectionType.java
diff --git a/src/java/net/brutex/xservices/types/ant/ContainsSelectorType.java b/src/main/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
rename to src/main/java/net/brutex/xservices/types/ant/ContainsSelectorType.java
diff --git a/src/java/net/brutex/xservices/types/ant/DateInfoType.java b/src/main/java/net/brutex/xservices/types/ant/DateInfoType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/DateInfoType.java
rename to src/main/java/net/brutex/xservices/types/ant/DateInfoType.java
diff --git a/src/java/net/brutex/xservices/types/ant/FileResource.java b/src/main/java/net/brutex/xservices/types/ant/FileResource.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/FileResource.java
rename to src/main/java/net/brutex/xservices/types/ant/FileResource.java
diff --git a/src/java/net/brutex/xservices/types/ant/FileSetResource.java b/src/main/java/net/brutex/xservices/types/ant/FileSetResource.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/FileSetResource.java
rename to src/main/java/net/brutex/xservices/types/ant/FileSetResource.java
diff --git a/src/java/net/brutex/xservices/types/ant/PatternElement.java b/src/main/java/net/brutex/xservices/types/ant/PatternElement.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/PatternElement.java
rename to src/main/java/net/brutex/xservices/types/ant/PatternElement.java
diff --git a/src/java/net/brutex/xservices/types/ant/PatternSetType.java b/src/main/java/net/brutex/xservices/types/ant/PatternSetType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/PatternSetType.java
rename to src/main/java/net/brutex/xservices/types/ant/PatternSetType.java
diff --git a/src/java/net/brutex/xservices/types/ant/ResourceInterface.java b/src/main/java/net/brutex/xservices/types/ant/ResourceInterface.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/ResourceInterface.java
rename to src/main/java/net/brutex/xservices/types/ant/ResourceInterface.java
diff --git a/src/java/net/brutex/xservices/types/ant/ResourceSetInterface.java b/src/main/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
rename to src/main/java/net/brutex/xservices/types/ant/ResourceSetInterface.java
diff --git a/src/java/net/brutex/xservices/types/ant/SelectorType.java b/src/main/java/net/brutex/xservices/types/ant/SelectorType.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/SelectorType.java
rename to src/main/java/net/brutex/xservices/types/ant/SelectorType.java
diff --git a/src/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java b/src/main/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
similarity index 100%
rename from src/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
rename to src/main/java/net/brutex/xservices/types/ant/SelectorTypeInterface.java
diff --git a/src/java/net/brutex/xservices/util/BasicCVSListener.java b/src/main/java/net/brutex/xservices/util/BasicCVSListener.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/BasicCVSListener.java
rename to src/main/java/net/brutex/xservices/util/BasicCVSListener.java
diff --git a/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java b/src/main/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
similarity index 95%
rename from src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
rename to src/main/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
index 51b4d8c..1e8445e 100644
--- a/src/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
+++ b/src/main/java/net/brutex/xservices/util/BrutexHSQLQuartzConnectionProvider.java
@@ -87,6 +87,11 @@ public class BrutexHSQLQuartzConnectionProvider implements ConnectionProvider {
 
 	}
 
+	@Override
+	public void initialize() throws SQLException {
+
+	}
+
 	private synchronized void recursiveDelete(File dbDir) {
 		File[] files = dbDir.listFiles();
 		for (int i = 0; i < files.length; i++) {
diff --git a/src/java/net/brutex/xservices/util/BrutexNamespaces.java b/src/main/java/net/brutex/xservices/util/BrutexNamespaces.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/BrutexNamespaces.java
rename to src/main/java/net/brutex/xservices/util/BrutexNamespaces.java
diff --git a/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java b/src/main/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
similarity index 95%
rename from src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
rename to src/main/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
index 733080d..c0b51c4 100644
--- a/src/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
+++ b/src/main/java/net/brutex/xservices/util/BrutexQuartzConnectionProvider.java
@@ -87,6 +87,11 @@ public class BrutexQuartzConnectionProvider implements ConnectionProvider {
 
 	}
 
+	@Override
+	public void initialize() throws SQLException {
+
+	}
+
 	private synchronized void recursiveDelete(File dbDir) {
 		File[] files = dbDir.listFiles();
 		for (int i = 0; i < files.length; i++) {
diff --git a/src/java/net/brutex/xservices/util/CVSClient.java b/src/main/java/net/brutex/xservices/util/CVSClient.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/CVSClient.java
rename to src/main/java/net/brutex/xservices/util/CVSClient.java
diff --git a/src/java/net/brutex/xservices/util/CVSRoot.java b/src/main/java/net/brutex/xservices/util/CVSRoot.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/CVSRoot.java
rename to src/main/java/net/brutex/xservices/util/CVSRoot.java
diff --git a/src/java/net/brutex/xservices/util/CvsPassword.java b/src/main/java/net/brutex/xservices/util/CvsPassword.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/CvsPassword.java
rename to src/main/java/net/brutex/xservices/util/CvsPassword.java
diff --git a/src/java/net/brutex/xservices/util/FileWalker.java b/src/main/java/net/brutex/xservices/util/FileWalker.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/FileWalker.java
rename to src/main/java/net/brutex/xservices/util/FileWalker.java
diff --git a/src/java/net/brutex/xservices/util/JobWrapper.java b/src/main/java/net/brutex/xservices/util/JobWrapper.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/JobWrapper.java
rename to src/main/java/net/brutex/xservices/util/JobWrapper.java
diff --git a/src/java/net/brutex/xservices/util/OpenAirConnection.java b/src/main/java/net/brutex/xservices/util/OpenAirConnection.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/OpenAirConnection.java
rename to src/main/java/net/brutex/xservices/util/OpenAirConnection.java
diff --git a/src/java/net/brutex/xservices/util/RunTask.java b/src/main/java/net/brutex/xservices/util/RunTask.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/RunTask.java
rename to src/main/java/net/brutex/xservices/util/RunTask.java
diff --git a/src/java/net/brutex/xservices/util/UnRarTask.java b/src/main/java/net/brutex/xservices/util/UnRarTask.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/UnRarTask.java
rename to src/main/java/net/brutex/xservices/util/UnRarTask.java
diff --git a/src/java/net/brutex/xservices/util/XServicesDocumentation.java b/src/main/java/net/brutex/xservices/util/XServicesDocumentation.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/XServicesDocumentation.java
rename to src/main/java/net/brutex/xservices/util/XServicesDocumentation.java
diff --git a/src/java/net/brutex/xservices/util/cache/CacheExecutorService.java b/src/main/java/net/brutex/xservices/util/cache/CacheExecutorService.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/cache/CacheExecutorService.java
rename to src/main/java/net/brutex/xservices/util/cache/CacheExecutorService.java
diff --git a/src/java/net/brutex/xservices/util/cache/CacheServlet.java b/src/main/java/net/brutex/xservices/util/cache/CacheServlet.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/cache/CacheServlet.java
rename to src/main/java/net/brutex/xservices/util/cache/CacheServlet.java
diff --git a/src/java/net/brutex/xservices/util/cache/DaemonThreadFactory.java b/src/main/java/net/brutex/xservices/util/cache/DaemonThreadFactory.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/cache/DaemonThreadFactory.java
rename to src/main/java/net/brutex/xservices/util/cache/DaemonThreadFactory.java
diff --git a/src/java/net/brutex/xservices/util/cache/FindingsCacheServlet.java b/src/main/java/net/brutex/xservices/util/cache/FindingsCacheServlet.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/cache/FindingsCacheServlet.java
rename to src/main/java/net/brutex/xservices/util/cache/FindingsCacheServlet.java
diff --git a/src/java/net/brutex/xservices/util/cache/FindingsConfigBean.java b/src/main/java/net/brutex/xservices/util/cache/FindingsConfigBean.java
similarity index 100%
rename from src/java/net/brutex/xservices/util/cache/FindingsConfigBean.java
rename to src/main/java/net/brutex/xservices/util/cache/FindingsConfigBean.java
diff --git a/src/java/net/brutex/xservices/ws/ArchiveService.java b/src/main/java/net/brutex/xservices/ws/ArchiveService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/ArchiveService.java
rename to src/main/java/net/brutex/xservices/ws/ArchiveService.java
diff --git a/src/java/net/brutex/xservices/ws/DateService.java b/src/main/java/net/brutex/xservices/ws/DateService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/DateService.java
rename to src/main/java/net/brutex/xservices/ws/DateService.java
diff --git a/src/java/net/brutex/xservices/ws/ExecuteService.java b/src/main/java/net/brutex/xservices/ws/ExecuteService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/ExecuteService.java
rename to src/main/java/net/brutex/xservices/ws/ExecuteService.java
diff --git a/src/java/net/brutex/xservices/ws/FileService.java b/src/main/java/net/brutex/xservices/ws/FileService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/FileService.java
rename to src/main/java/net/brutex/xservices/ws/FileService.java
diff --git a/src/java/net/brutex/xservices/ws/JobService.java b/src/main/java/net/brutex/xservices/ws/JobService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/JobService.java
rename to src/main/java/net/brutex/xservices/ws/JobService.java
diff --git a/src/java/net/brutex/xservices/ws/MailService.java b/src/main/java/net/brutex/xservices/ws/MailService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/MailService.java
rename to src/main/java/net/brutex/xservices/ws/MailService.java
diff --git a/src/java/net/brutex/xservices/ws/MiscService.java b/src/main/java/net/brutex/xservices/ws/MiscService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/MiscService.java
rename to src/main/java/net/brutex/xservices/ws/MiscService.java
diff --git a/src/java/net/brutex/xservices/ws/OpenAirProxyService.java b/src/main/java/net/brutex/xservices/ws/OpenAirProxyService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/OpenAirProxyService.java
rename to src/main/java/net/brutex/xservices/ws/OpenAirProxyService.java
diff --git a/src/java/net/brutex/xservices/ws/StorageService.java b/src/main/java/net/brutex/xservices/ws/StorageService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/StorageService.java
rename to src/main/java/net/brutex/xservices/ws/StorageService.java
diff --git a/src/java/net/brutex/xservices/ws/StringService.java b/src/main/java/net/brutex/xservices/ws/StringService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/StringService.java
rename to src/main/java/net/brutex/xservices/ws/StringService.java
diff --git a/src/java/net/brutex/xservices/ws/XServicesFault.java b/src/main/java/net/brutex/xservices/ws/XServicesFault.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/XServicesFault.java
rename to src/main/java/net/brutex/xservices/ws/XServicesFault.java
diff --git a/src/java/net/brutex/xservices/ws/XmlService.java b/src/main/java/net/brutex/xservices/ws/XmlService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/XmlService.java
rename to src/main/java/net/brutex/xservices/ws/XmlService.java
diff --git a/src/java/net/brutex/xservices/ws/impl/ArchiveServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/ArchiveServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/ArchiveServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/ArchiveServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/DateServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/DateServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/DateServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/DateServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/ExecuteServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/ExecuteServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/ExecuteServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/ExecuteServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/FileServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/FileServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/FileServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/FileServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/JobServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/JobServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/JobServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/JobServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/MailServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/MailServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/MailServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/MailServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/Messages.java b/src/main/java/net/brutex/xservices/ws/impl/Messages.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/Messages.java
rename to src/main/java/net/brutex/xservices/ws/impl/Messages.java
diff --git a/src/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/OpenAirProxyServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/StorageServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/StorageServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/StorageServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/StorageServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/StringServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/StringServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/StringServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/StringServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/XmlServiceImpl.java b/src/main/java/net/brutex/xservices/ws/impl/XmlServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/XmlServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/impl/XmlServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/impl/messages.properties b/src/main/java/net/brutex/xservices/ws/impl/messages.properties
similarity index 100%
rename from src/java/net/brutex/xservices/ws/impl/messages.properties
rename to src/main/java/net/brutex/xservices/ws/impl/messages.properties
diff --git a/src/java/net/brutex/xservices/ws/rs/CVSInfo.java b/src/main/java/net/brutex/xservices/ws/rs/CVSInfo.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/CVSInfo.java
rename to src/main/java/net/brutex/xservices/ws/rs/CVSInfo.java
diff --git a/src/java/net/brutex/xservices/ws/rs/CVSInfoImpl.java b/src/main/java/net/brutex/xservices/ws/rs/CVSInfoImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/CVSInfoImpl.java
rename to src/main/java/net/brutex/xservices/ws/rs/CVSInfoImpl.java
diff --git a/src/java/net/brutex/xservices/ws/rs/DIMCMInfo.java b/src/main/java/net/brutex/xservices/ws/rs/DIMCMInfo.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/DIMCMInfo.java
rename to src/main/java/net/brutex/xservices/ws/rs/DIMCMInfo.java
diff --git a/src/java/net/brutex/xservices/ws/rs/DIMCMInfoImpl.java b/src/main/java/net/brutex/xservices/ws/rs/DIMCMInfoImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/DIMCMInfoImpl.java
rename to src/main/java/net/brutex/xservices/ws/rs/DIMCMInfoImpl.java
diff --git a/src/java/net/brutex/xservices/ws/rs/FileInfo.java b/src/main/java/net/brutex/xservices/ws/rs/FileInfo.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/FileInfo.java
rename to src/main/java/net/brutex/xservices/ws/rs/FileInfo.java
diff --git a/src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java b/src/main/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
rename to src/main/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
diff --git a/src/java/net/brutex/xservices/ws/rs/FileListType.java b/src/main/java/net/brutex/xservices/ws/rs/FileListType.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/FileListType.java
rename to src/main/java/net/brutex/xservices/ws/rs/FileListType.java
diff --git a/src/java/net/brutex/xservices/ws/rs/OpenAirInfoService.java b/src/main/java/net/brutex/xservices/ws/rs/OpenAirInfoService.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/OpenAirInfoService.java
rename to src/main/java/net/brutex/xservices/ws/rs/OpenAirInfoService.java
diff --git a/src/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java b/src/main/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java
rename to src/main/java/net/brutex/xservices/ws/rs/OpenAirInfoServiceImpl.java
diff --git a/src/java/net/brutex/xservices/ws/rs/ResultType.java b/src/main/java/net/brutex/xservices/ws/rs/ResultType.java
similarity index 100%
rename from src/java/net/brutex/xservices/ws/rs/ResultType.java
rename to src/main/java/net/brutex/xservices/ws/rs/ResultType.java
diff --git a/src/java/cache.ccf b/src/main/resources/cache.ccf
similarity index 100%
rename from src/java/cache.ccf
rename to src/main/resources/cache.ccf
diff --git a/src/java/log4j.properties b/src/main/resources/log4j.properties
similarity index 100%
rename from src/java/log4j.properties
rename to src/main/resources/log4j.properties
diff --git a/src/java/log4j2.xml b/src/main/resources/log4j2.xml
similarity index 100%
rename from src/java/log4j2.xml
rename to src/main/resources/log4j2.xml
diff --git a/src/java/quartz.properties b/src/main/resources/quartz.properties
similarity index 100%
rename from src/java/quartz.properties
rename to src/main/resources/quartz.properties
diff --git a/web/LICENSE b/src/main/webapp/LICENSE
similarity index 100%
rename from web/LICENSE
rename to src/main/webapp/LICENSE
diff --git a/src/main/webapp/LICENSE.H2 b/src/main/webapp/LICENSE.H2
new file mode 100644
index 0000000..5b67402
--- /dev/null
+++ b/src/main/webapp/LICENSE.H2
@@ -0,0 +1,6 @@
+This software contains unmodified binary redistributions for
+H2 database engine (https://h2database.com/),
+which is dual licensed and available under the MPL 2.0
+(Mozilla Public License) or under the EPL 1.0 (Eclipse Public License).
+An original copy of the license agreement can be found at:
+https://h2database.com/html/license.html
diff --git a/web/LICENSE.ant b/src/main/webapp/LICENSE.ant
similarity index 100%
rename from web/LICENSE.ant
rename to src/main/webapp/LICENSE.ant
diff --git a/web/LICENSE.antcontrib b/src/main/webapp/LICENSE.antcontrib
similarity index 100%
rename from web/LICENSE.antcontrib
rename to src/main/webapp/LICENSE.antcontrib
diff --git a/web/LICENSE.cxf b/src/main/webapp/LICENSE.cxf
similarity index 100%
rename from web/LICENSE.cxf
rename to src/main/webapp/LICENSE.cxf
diff --git a/web/LICENSE.jaxb b/src/main/webapp/LICENSE.jaxb
similarity index 100%
rename from web/LICENSE.jaxb
rename to src/main/webapp/LICENSE.jaxb
diff --git a/web/LICENSE.unrar b/src/main/webapp/LICENSE.unrar
similarity index 100%
rename from web/LICENSE.unrar
rename to src/main/webapp/LICENSE.unrar
diff --git a/web/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from web/META-INF/MANIFEST.MF
rename to src/main/webapp/META-INF/MANIFEST.MF
diff --git a/web/NOTICE b/src/main/webapp/NOTICE
similarity index 100%
rename from web/NOTICE
rename to src/main/webapp/NOTICE
diff --git a/web/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from web/WEB-INF/applicationContext.xml
rename to src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/web/WEB-INF/data/QRTZ_BLOB_TRIGGERS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_BLOB_TRIGGERS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_BLOB_TRIGGERS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_BLOB_TRIGGERS.ddl
diff --git a/web/WEB-INF/data/QRTZ_CALENDARS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_CALENDARS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_CALENDARS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_CALENDARS.ddl
diff --git a/web/WEB-INF/data/QRTZ_CRON_TRIGGERS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_CRON_TRIGGERS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_CRON_TRIGGERS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_CRON_TRIGGERS.ddl
diff --git a/web/WEB-INF/data/QRTZ_FIRED_TRIGGERS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_FIRED_TRIGGERS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_FIRED_TRIGGERS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_FIRED_TRIGGERS.ddl
diff --git a/web/WEB-INF/data/QRTZ_JOB_DETAILS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_JOB_DETAILS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_JOB_DETAILS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_JOB_DETAILS.ddl
diff --git a/web/WEB-INF/data/QRTZ_LOCKS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_LOCKS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_LOCKS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_LOCKS.ddl
diff --git a/web/WEB-INF/data/QRTZ_PAUSED_TRIGGER_GRPS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_PAUSED_TRIGGER_GRPS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_PAUSED_TRIGGER_GRPS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_PAUSED_TRIGGER_GRPS.ddl
diff --git a/web/WEB-INF/data/QRTZ_SCHEDULER_STATE.ddl b/src/main/webapp/WEB-INF/data/QRTZ_SCHEDULER_STATE.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_SCHEDULER_STATE.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_SCHEDULER_STATE.ddl
diff --git a/web/WEB-INF/data/QRTZ_SIMPLE_TRIGGERS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_SIMPLE_TRIGGERS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_SIMPLE_TRIGGERS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_SIMPLE_TRIGGERS.ddl
diff --git a/web/WEB-INF/data/QRTZ_SIMPROP_TRIGGERS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_SIMPROP_TRIGGERS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_SIMPROP_TRIGGERS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_SIMPROP_TRIGGERS.ddl
diff --git a/web/WEB-INF/data/QRTZ_TRIGGERS.ddl b/src/main/webapp/WEB-INF/data/QRTZ_TRIGGERS.ddl
similarity index 100%
rename from web/WEB-INF/data/QRTZ_TRIGGERS.ddl
rename to src/main/webapp/WEB-INF/data/QRTZ_TRIGGERS.ddl
diff --git a/web/WEB-INF/dimcm.properties b/src/main/webapp/WEB-INF/dimcm.properties
similarity index 100%
rename from web/WEB-INF/dimcm.properties
rename to src/main/webapp/WEB-INF/dimcm.properties
diff --git a/web/WEB-INF/log4j2.xml b/src/main/webapp/WEB-INF/log4j2.xml
similarity index 100%
rename from web/WEB-INF/log4j2.xml
rename to src/main/webapp/WEB-INF/log4j2.xml
diff --git a/web/WEB-INF/shiro.ini b/src/main/webapp/WEB-INF/shiro.ini
similarity index 100%
rename from web/WEB-INF/shiro.ini
rename to src/main/webapp/WEB-INF/shiro.ini
diff --git a/web/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 96%
rename from web/WEB-INF/web.xml
rename to src/main/webapp/WEB-INF/web.xml
index 5e2b14d..601b942 100644
--- a/web/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,7 +4,6 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
 	version="2.5">
 
-
 	<context-param>
         <param-name>log4jConfiguration</param-name>
         <param-value>/WEB-INF/log4j2.xml</param-value>
diff --git a/web/index.html b/src/main/webapp/index.html
similarity index 100%
rename from web/index.html
rename to src/main/webapp/index.html