diff --git a/.gitignore b/.gitignore
index 0ca1cc0..929cefd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,28 @@
 ._*
 Desktop.ini
 Thumbs.db
+
+#eclipse
+**/bin
+**/.settings
+**/.classpath
+*.project
+
+#In case people make their workspace in the repo
+/eclipse/
+
+#idea
+/.idea
+/classes
+*.iml
+
+#gradle
+/build
+/.gradle
+!gradle/wrapper/*
+
+gradle.properties
+!/mdk/gradle.properties
+
+#Public folder
+/repo/
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..cef7fff
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,97 @@
+plugins {
+  id 'org.ajoberstar.grgit' version '3.1.0'
+  id 'com.github.johnrengelman.shadow' version '5.1.0'
+  id 'java'
+  id 'maven'
+  id 'maven-publish'
+  id 'eclipse'
+}
+
+
+group = 'org.jbls'
+version = gitVersion()
+targetCompatibility = sourceCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+
+repositories {
+    mavenCentral()
+}
+
+def gitVersion() {
+    /* If you want to use Tags and automatically have it mark each version as unique based on distance to tag.
+    def desc = grgit.describe(longDescr: true).split('-') as List
+    def hash = desc.remove(desc.size() - 1)
+    def offset = desc.remove(desc.size() - 1)
+    def tag = desc.join('-')
+    def branch = grgit.branch.current().name    
+    return "${tag}.${offset}${t -> if (branch != 'master') t << '-' + branch}"
+    */
+    return "3.1-${grgit.head().abbreviatedId}"
+}
+
+jar {
+    manifest.attributes('Main-Class': 'Main')
+    manifest.attributes('Implementation-Version': project.version)
+}
+/*
+shadowJar {
+    classifier 'fatjar'
+    manifest.attributes('Main-Class': 'org.jbls.Main')
+    manifest.attributes('Implementation-Version': project.version)
+}*/
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives jar
+    //archives shadowJar
+    archives sourcesJar
+}
+
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+}
+
+wrapper {
+    distributionType = Wrapper.DistributionType.BIN
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar
+            //artifact shadowJar
+
+            pom {
+                name = 'JBLS'
+                description = 'Java Battle.net Logon Server- Java implementation of ValhallaLegend\'s BNLS protocol for interacting with Battle.net classic servers.'
+                url = 'https://github.com/Davnit/JBLS/'
+                scm {
+                    url = 'https://github.com/Davnit/JBLS/'
+                    connection = 'scm:git:git://github.com/Davnit/JBLS/.git'
+                    developerConnection = 'scm:git:git@github.com:Davnit/JBLS.git'
+                }
+                issueManagement {
+                    system = 'github'
+                    url = 'https://github.com/Davnit/JBLS/issues'
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            if (project.hasProperty('mavenPassword')) {
+                credentials {
+                    username project.properties.mavenUser
+                    password project.properties.mavenPassword
+                }
+                url project.properties.mavenURL
+            } else {
+                url 'file://' + rootProject.file('repo').getAbsolutePath()
+            }
+        }
+    }
+}
diff --git a/build.sh b/build.sh
deleted file mode 100644
index 6118df0..0000000
--- a/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -ex
-
-# Compile
-find -name '*.java' > build.sources.tmp
-javac @build.sources.tmp
-rm build.sources.tmp
-
-# Alternative compile: not sure how different this is from the "official" way,
-# but it seems cleaner and seems to produce the same output.
-#find -name '*.java' -print0 | xargs -0 javac
-
-# Create archive
-jar cfm ./JBLS-$(git log --pretty=format:'%h' -n 1).jar ./MANIFEST.MF *
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..5c2d1cf
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..4b7e1f3
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..8e25e6c
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or 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 UN*X
+##
+##############################################################################
+
+# 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
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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"'
+
+# 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
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  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"
+    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" -a "$nonstop" = "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
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..9618d8d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,100 @@
+@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=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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%" == "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 Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_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=%*
+
+: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/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..ed1718d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'JBLS'
diff --git a/BNLSProtocol/BNLSConnectionThread.java b/src/main/java/BNLSProtocol/BNLSConnectionThread.java
similarity index 100%
rename from BNLSProtocol/BNLSConnectionThread.java
rename to src/main/java/BNLSProtocol/BNLSConnectionThread.java
diff --git a/BNLSProtocol/BNLSException.java b/src/main/java/BNLSProtocol/BNLSException.java
similarity index 100%
rename from BNLSProtocol/BNLSException.java
rename to src/main/java/BNLSProtocol/BNLSException.java
diff --git a/BNLSProtocol/BNLSParse.java b/src/main/java/BNLSProtocol/BNLSParse.java
similarity index 100%
rename from BNLSProtocol/BNLSParse.java
rename to src/main/java/BNLSProtocol/BNLSParse.java
diff --git a/BNLSProtocol/BNLSServer.java b/src/main/java/BNLSProtocol/BNLSServer.java
similarity index 100%
rename from BNLSProtocol/BNLSServer.java
rename to src/main/java/BNLSProtocol/BNLSServer.java
diff --git a/BNLSProtocol/BNLSlist.java b/src/main/java/BNLSProtocol/BNLSlist.java
similarity index 100%
rename from BNLSProtocol/BNLSlist.java
rename to src/main/java/BNLSProtocol/BNLSlist.java
diff --git a/BNLSProtocol/InPacketBuffer.java b/src/main/java/BNLSProtocol/InPacketBuffer.java
similarity index 100%
rename from BNLSProtocol/InPacketBuffer.java
rename to src/main/java/BNLSProtocol/InPacketBuffer.java
diff --git a/BNLSProtocol/InvalidPacketException.java b/src/main/java/BNLSProtocol/InvalidPacketException.java
similarity index 100%
rename from BNLSProtocol/InvalidPacketException.java
rename to src/main/java/BNLSProtocol/InvalidPacketException.java
diff --git a/BNLSProtocol/IpAuth.java b/src/main/java/BNLSProtocol/IpAuth.java
similarity index 100%
rename from BNLSProtocol/IpAuth.java
rename to src/main/java/BNLSProtocol/IpAuth.java
diff --git a/BNLSProtocol/OutPacketBuffer.java b/src/main/java/BNLSProtocol/OutPacketBuffer.java
similarity index 100%
rename from BNLSProtocol/OutPacketBuffer.java
rename to src/main/java/BNLSProtocol/OutPacketBuffer.java
diff --git a/HTTP/HTTPParse.java b/src/main/java/HTTP/HTTPParse.java
similarity index 100%
rename from HTTP/HTTPParse.java
rename to src/main/java/HTTP/HTTPParse.java
diff --git a/HTTP/HTTPSendFile.java b/src/main/java/HTTP/HTTPSendFile.java
similarity index 100%
rename from HTTP/HTTPSendFile.java
rename to src/main/java/HTTP/HTTPSendFile.java
diff --git a/HTTP/HTTPServer.java b/src/main/java/HTTP/HTTPServer.java
similarity index 100%
rename from HTTP/HTTPServer.java
rename to src/main/java/HTTP/HTTPServer.java
diff --git a/Hashing/BrokenSHA1.java b/src/main/java/Hashing/BrokenSHA1.java
similarity index 100%
rename from Hashing/BrokenSHA1.java
rename to src/main/java/Hashing/BrokenSHA1.java
diff --git a/Hashing/CheckRevisionV1.java b/src/main/java/Hashing/CheckRevisionV1.java
similarity index 100%
rename from Hashing/CheckRevisionV1.java
rename to src/main/java/Hashing/CheckRevisionV1.java
diff --git a/Hashing/CheckRevisionV2.java b/src/main/java/Hashing/CheckRevisionV2.java
similarity index 100%
rename from Hashing/CheckRevisionV2.java
rename to src/main/java/Hashing/CheckRevisionV2.java
diff --git a/Hashing/CheckRevisionV3.java b/src/main/java/Hashing/CheckRevisionV3.java
similarity index 100%
rename from Hashing/CheckRevisionV3.java
rename to src/main/java/Hashing/CheckRevisionV3.java
diff --git a/Hashing/CheckRevisionV4.java b/src/main/java/Hashing/CheckRevisionV4.java
similarity index 100%
rename from Hashing/CheckRevisionV4.java
rename to src/main/java/Hashing/CheckRevisionV4.java
diff --git a/Hashing/CheckrevisionResults.java b/src/main/java/Hashing/CheckrevisionResults.java
similarity index 100%
rename from Hashing/CheckrevisionResults.java
rename to src/main/java/Hashing/CheckrevisionResults.java
diff --git a/Hashing/D2KeyDecode.java b/src/main/java/Hashing/D2KeyDecode.java
similarity index 100%
rename from Hashing/D2KeyDecode.java
rename to src/main/java/Hashing/D2KeyDecode.java
diff --git a/Hashing/DoubleHash.java b/src/main/java/Hashing/DoubleHash.java
similarity index 100%
rename from Hashing/DoubleHash.java
rename to src/main/java/Hashing/DoubleHash.java
diff --git a/Hashing/HashException.java b/src/main/java/Hashing/HashException.java
similarity index 100%
rename from Hashing/HashException.java
rename to src/main/java/Hashing/HashException.java
diff --git a/Hashing/HashMain.java b/src/main/java/Hashing/HashMain.java
similarity index 100%
rename from Hashing/HashMain.java
rename to src/main/java/Hashing/HashMain.java
diff --git a/Hashing/SCKeyDecode.java b/src/main/java/Hashing/SCKeyDecode.java
similarity index 100%
rename from Hashing/SCKeyDecode.java
rename to src/main/java/Hashing/SCKeyDecode.java
diff --git a/Hashing/SRP.java b/src/main/java/Hashing/SRP.java
similarity index 100%
rename from Hashing/SRP.java
rename to src/main/java/Hashing/SRP.java
diff --git a/Hashing/War3Decode.java b/src/main/java/Hashing/War3Decode.java
similarity index 100%
rename from Hashing/War3Decode.java
rename to src/main/java/Hashing/War3Decode.java
diff --git a/Hashing/lockdown_SHA1.java b/src/main/java/Hashing/lockdown_SHA1.java
similarity index 100%
rename from Hashing/lockdown_SHA1.java
rename to src/main/java/Hashing/lockdown_SHA1.java
diff --git a/Hashing/lockdown_heap.java b/src/main/java/Hashing/lockdown_heap.java
similarity index 100%
rename from Hashing/lockdown_heap.java
rename to src/main/java/Hashing/lockdown_heap.java
diff --git a/Main.java b/src/main/java/Main.java
similarity index 100%
rename from Main.java
rename to src/main/java/Main.java
diff --git a/util/BNFTP.java b/src/main/java/util/BNFTP.java
similarity index 100%
rename from util/BNFTP.java
rename to src/main/java/util/BNFTP.java
diff --git a/util/BigIntegerEx.java b/src/main/java/util/BigIntegerEx.java
similarity index 100%
rename from util/BigIntegerEx.java
rename to src/main/java/util/BigIntegerEx.java
diff --git a/util/BotNet.java b/src/main/java/util/BotNet.java
similarity index 100%
rename from util/BotNet.java
rename to src/main/java/util/BotNet.java
diff --git a/util/Buffer.java b/src/main/java/util/Buffer.java
similarity index 100%
rename from util/Buffer.java
rename to src/main/java/util/Buffer.java
diff --git a/util/ByteFromIntArray.java b/src/main/java/util/ByteFromIntArray.java
similarity index 100%
rename from util/ByteFromIntArray.java
rename to src/main/java/util/ByteFromIntArray.java
diff --git a/util/Constants.java b/src/main/java/util/Constants.java
similarity index 100%
rename from util/Constants.java
rename to src/main/java/util/Constants.java
diff --git a/util/Controller.java b/src/main/java/util/Controller.java
similarity index 100%
rename from util/Controller.java
rename to src/main/java/util/Controller.java
diff --git a/util/Database.java b/src/main/java/util/Database.java
similarity index 100%
rename from util/Database.java
rename to src/main/java/util/Database.java
diff --git a/util/Ini.java b/src/main/java/util/Ini.java
similarity index 100%
rename from util/Ini.java
rename to src/main/java/util/Ini.java
diff --git a/util/IntFromByteArray.java b/src/main/java/util/IntFromByteArray.java
similarity index 100%
rename from util/IntFromByteArray.java
rename to src/main/java/util/IntFromByteArray.java
diff --git a/util/Out.java b/src/main/java/util/Out.java
similarity index 100%
rename from util/Out.java
rename to src/main/java/util/Out.java
diff --git a/util/PE.java b/src/main/java/util/PE.java
similarity index 100%
rename from util/PE.java
rename to src/main/java/util/PE.java
diff --git a/util/PEFiles/HEADER.java b/src/main/java/util/PEFiles/HEADER.java
similarity index 100%
rename from util/PEFiles/HEADER.java
rename to src/main/java/util/PEFiles/HEADER.java
diff --git a/util/PEFiles/IMAGE_DATA_DIRECTORY.java b/src/main/java/util/PEFiles/IMAGE_DATA_DIRECTORY.java
similarity index 100%
rename from util/PEFiles/IMAGE_DATA_DIRECTORY.java
rename to src/main/java/util/PEFiles/IMAGE_DATA_DIRECTORY.java
diff --git a/util/PEFiles/IMAGE_DOS_HEADER.java b/src/main/java/util/PEFiles/IMAGE_DOS_HEADER.java
similarity index 100%
rename from util/PEFiles/IMAGE_DOS_HEADER.java
rename to src/main/java/util/PEFiles/IMAGE_DOS_HEADER.java
diff --git a/util/PEFiles/IMAGE_EXPORT_DIRECTORY.java b/src/main/java/util/PEFiles/IMAGE_EXPORT_DIRECTORY.java
similarity index 100%
rename from util/PEFiles/IMAGE_EXPORT_DIRECTORY.java
rename to src/main/java/util/PEFiles/IMAGE_EXPORT_DIRECTORY.java
diff --git a/util/PEFiles/IMAGE_FILE_HEADER.java b/src/main/java/util/PEFiles/IMAGE_FILE_HEADER.java
similarity index 100%
rename from util/PEFiles/IMAGE_FILE_HEADER.java
rename to src/main/java/util/PEFiles/IMAGE_FILE_HEADER.java
diff --git a/util/PEFiles/IMAGE_IMPORT_DIRECTORY.java b/src/main/java/util/PEFiles/IMAGE_IMPORT_DIRECTORY.java
similarity index 100%
rename from util/PEFiles/IMAGE_IMPORT_DIRECTORY.java
rename to src/main/java/util/PEFiles/IMAGE_IMPORT_DIRECTORY.java
diff --git a/util/PEFiles/IMAGE_NT_HEADERS.java b/src/main/java/util/PEFiles/IMAGE_NT_HEADERS.java
similarity index 100%
rename from util/PEFiles/IMAGE_NT_HEADERS.java
rename to src/main/java/util/PEFiles/IMAGE_NT_HEADERS.java
diff --git a/util/PEFiles/IMAGE_OPTIONAL_HEADER32.java b/src/main/java/util/PEFiles/IMAGE_OPTIONAL_HEADER32.java
similarity index 100%
rename from util/PEFiles/IMAGE_OPTIONAL_HEADER32.java
rename to src/main/java/util/PEFiles/IMAGE_OPTIONAL_HEADER32.java
diff --git a/util/PEFiles/IMAGE_SECTION_HEADER.java b/src/main/java/util/PEFiles/IMAGE_SECTION_HEADER.java
similarity index 100%
rename from util/PEFiles/IMAGE_SECTION_HEADER.java
rename to src/main/java/util/PEFiles/IMAGE_SECTION_HEADER.java
diff --git a/util/PEFiles/ImportAddressManager.java b/src/main/java/util/PEFiles/ImportAddressManager.java
similarity index 100%
rename from util/PEFiles/ImportAddressManager.java
rename to src/main/java/util/PEFiles/ImportAddressManager.java
diff --git a/util/PEFiles/PEFile.java b/src/main/java/util/PEFiles/PEFile.java
similarity index 100%
rename from util/PEFiles/PEFile.java
rename to src/main/java/util/PEFiles/PEFile.java
diff --git a/util/PadString.java b/src/main/java/util/PadString.java
similarity index 100%
rename from util/PadString.java
rename to src/main/java/util/PadString.java
diff --git a/util/Statistics.java b/src/main/java/util/Statistics.java
similarity index 100%
rename from util/Statistics.java
rename to src/main/java/util/Statistics.java
diff --git a/util/ZIP.java b/src/main/java/util/ZIP.java
similarity index 100%
rename from util/ZIP.java
rename to src/main/java/util/ZIP.java
diff --git a/util/cSettings.java b/src/main/java/util/cSettings.java
similarity index 100%
rename from util/cSettings.java
rename to src/main/java/util/cSettings.java
diff --git a/util/seed_finder.java b/src/main/java/util/seed_finder.java
similarity index 100%
rename from util/seed_finder.java
rename to src/main/java/util/seed_finder.java
diff --git a/src/test/java/org/jbls/test/HashTest.java b/src/test/java/org/jbls/test/HashTest.java
new file mode 100644
index 0000000..882eccd
--- /dev/null
+++ b/src/test/java/org/jbls/test/HashTest.java
@@ -0,0 +1,33 @@
+package org.jbls.test;
+
+import org.junit.jupiter.api.Test;
+
+import Hashing.BrokenSHA1;
+import util.PadString;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class HashTest {
+    @Test
+    public void testBSHA1() {
+        String[] tests = {
+            "67452301efcdab8998badcfe10325476c3d2e1f0", "",
+            "fe4424936dc20078a033955159f823036e513f13", "a",
+            "7bf57a7acc1be999f975dce65522fe81ab78c8d6", "abc",
+            "b46b845a32a0363b222751511e03cee2f36f83c1", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+            "f5c42efa8db3d52e9eb8e8cc707824d11873f714", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
+        };
+
+        for (int x = 0; x < tests.length - 1; x += 2) {
+            assertEquals(tests[x], toHex(BrokenSHA1.calcHashBuffer(tests[x+1].getBytes()), 5));
+        }
+
+    }
+
+    private String toHex(int[] data, int len) {
+        StringBuilder buf = new StringBuilder();
+        for (int x = 0; x < len && x < data.length; x++)
+            buf.append(PadString.padHex(data[x], 8));
+        return buf.toString();
+    }
+}