diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..884ddfb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,116 @@
+
+# Created by https://www.gitignore.io/api/java,intellij,gradle
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Gradle ###
+.gradle
+**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+
+# End of https://www.gitignore.io/api/java,intellij,gradle
+
+src/test/java/me/duncte123/weebJavaTests/Secrets\.java
+
+\.idea/modules/
+
+*.iml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..11ae9d7
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="wolfram-alpha-java-binding_main" target="1.8" />
+      <module name="wolfram-alpha-java-binding_test" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..fd2f27a
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..c682ed1
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/wolfram-alpha-java-binding.iml" filepath="$PROJECT_DIR$/wolfram-alpha-java-binding.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wolfram-alpha-java-binding_main.iml" filepath="$PROJECT_DIR$/.idea/modules/wolfram-alpha-java-binding_main.iml" group="wolfram-alpha-java-binding" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/wolfram-alpha-java-binding_test.iml" filepath="$PROJECT_DIR$/.idea/modules/wolfram-alpha-java-binding_test.iml" group="wolfram-alpha-java-binding" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ReadMe.txt b/ReadMe.txt
index ea4c14e..6e80a5f 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -30,3 +30,29 @@ I used.
 
 
 Look at the simple sample program included to get started.
+
+Add this to your pom.xml to use it with maven:
+
+<repositories>
+    <repository>
+        <id>jitpack.io</id>
+        <url>https://jitpack.io</url>
+    </repository>
+</repositories>
+<dependency>
+    <groupId>com.github.aeurielesn</groupId>
+    <artifactId>wolfram-alpha-java-binding</artifactId>
+    <version>master-SNAPSHOT</version>
+</dependency>
+
+Add this to your build.gradle to use it with gradle:
+
+allprojects {
+    repositories {
+        ...
+        maven { url 'https://jitpack.io' }
+    }
+}
+dependencies {
+        implementation 'com.github.aeurielesn:wolfram-alpha-java-binding:master-SNAPSHOT'
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..831847c
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,53 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This is a general purpose Gradle build.
+ * Learn how to create Gradle builds at https://guides.gradle.org/creating-new-gradle-builds/
+ */
+
+plugins {
+    id 'java'
+    id 'idea'
+    id 'maven-publish'
+}
+
+group = "com.wolfaram.alpha"
+archivesBaseName = "WolfaramAlpha"
+version = "1.1"
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    // https://mvnrepository.com/artifact/commons-codec/commons-codec
+    compile group: 'commons-codec', name: 'commons-codec', version: '1.3'
+    // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
+    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0.1'
+    // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore
+    compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.0.1'
+    // https://mvnrepository.com/artifact/commons-logging/commons-logging
+    compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
+
+}
+
+publishing {
+    publications {
+        MavenProject(MavenPublication) {
+            from components.java
+            groupId group
+            artifactId archivesBaseName
+            version = version
+        }
+    }
+}
+
+build {
+    dependsOn clean
+    dependsOn jar
+
+    jar.mustRunAfter clean
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..0d4a951
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..a95009c
--- /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-4.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  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=""
+
+# 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..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@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=
+
+@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..723bdb7
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * 
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/4.9/userguide/multi_project_builds.html
+ */
+
+rootProject.name = 'wolfram-alpha-java-binding'
diff --git a/Source/com/wolfram/alpha/WAAssumption.java b/src/main/java/com/wolfram/alpha/WAAssumption.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAAssumption.java
rename to src/main/java/com/wolfram/alpha/WAAssumption.java
diff --git a/Source/com/wolfram/alpha/WAEngine.java b/src/main/java/com/wolfram/alpha/WAEngine.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAEngine.java
rename to src/main/java/com/wolfram/alpha/WAEngine.java
diff --git a/Source/com/wolfram/alpha/WAExamplePage.java b/src/main/java/com/wolfram/alpha/WAExamplePage.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAExamplePage.java
rename to src/main/java/com/wolfram/alpha/WAExamplePage.java
diff --git a/Source/com/wolfram/alpha/WAException.java b/src/main/java/com/wolfram/alpha/WAException.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAException.java
rename to src/main/java/com/wolfram/alpha/WAException.java
diff --git a/Source/com/wolfram/alpha/WAFutureTopic.java b/src/main/java/com/wolfram/alpha/WAFutureTopic.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAFutureTopic.java
rename to src/main/java/com/wolfram/alpha/WAFutureTopic.java
diff --git a/Source/com/wolfram/alpha/WAImage.java b/src/main/java/com/wolfram/alpha/WAImage.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAImage.java
rename to src/main/java/com/wolfram/alpha/WAImage.java
diff --git a/Source/com/wolfram/alpha/WAInfo.java b/src/main/java/com/wolfram/alpha/WAInfo.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAInfo.java
rename to src/main/java/com/wolfram/alpha/WAInfo.java
diff --git a/Source/com/wolfram/alpha/WALink.java b/src/main/java/com/wolfram/alpha/WALink.java
similarity index 100%
rename from Source/com/wolfram/alpha/WALink.java
rename to src/main/java/com/wolfram/alpha/WALink.java
diff --git a/Source/com/wolfram/alpha/WAPlainText.java b/src/main/java/com/wolfram/alpha/WAPlainText.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAPlainText.java
rename to src/main/java/com/wolfram/alpha/WAPlainText.java
diff --git a/Source/com/wolfram/alpha/WAPod.java b/src/main/java/com/wolfram/alpha/WAPod.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAPod.java
rename to src/main/java/com/wolfram/alpha/WAPod.java
diff --git a/Source/com/wolfram/alpha/WAPodState.java b/src/main/java/com/wolfram/alpha/WAPodState.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAPodState.java
rename to src/main/java/com/wolfram/alpha/WAPodState.java
diff --git a/Source/com/wolfram/alpha/WAQuery.java b/src/main/java/com/wolfram/alpha/WAQuery.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAQuery.java
rename to src/main/java/com/wolfram/alpha/WAQuery.java
diff --git a/Source/com/wolfram/alpha/WAQueryParameters.java b/src/main/java/com/wolfram/alpha/WAQueryParameters.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAQueryParameters.java
rename to src/main/java/com/wolfram/alpha/WAQueryParameters.java
diff --git a/Source/com/wolfram/alpha/WAQueryResult.java b/src/main/java/com/wolfram/alpha/WAQueryResult.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAQueryResult.java
rename to src/main/java/com/wolfram/alpha/WAQueryResult.java
diff --git a/Source/com/wolfram/alpha/WAReinterpretWarning.java b/src/main/java/com/wolfram/alpha/WAReinterpretWarning.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAReinterpretWarning.java
rename to src/main/java/com/wolfram/alpha/WAReinterpretWarning.java
diff --git a/Source/com/wolfram/alpha/WARelatedExample.java b/src/main/java/com/wolfram/alpha/WARelatedExample.java
similarity index 100%
rename from Source/com/wolfram/alpha/WARelatedExample.java
rename to src/main/java/com/wolfram/alpha/WARelatedExample.java
diff --git a/Source/com/wolfram/alpha/WARelatedLink.java b/src/main/java/com/wolfram/alpha/WARelatedLink.java
similarity index 100%
rename from Source/com/wolfram/alpha/WARelatedLink.java
rename to src/main/java/com/wolfram/alpha/WARelatedLink.java
diff --git a/Source/com/wolfram/alpha/WASound.java b/src/main/java/com/wolfram/alpha/WASound.java
similarity index 100%
rename from Source/com/wolfram/alpha/WASound.java
rename to src/main/java/com/wolfram/alpha/WASound.java
diff --git a/Source/com/wolfram/alpha/WASourceInfo.java b/src/main/java/com/wolfram/alpha/WASourceInfo.java
similarity index 100%
rename from Source/com/wolfram/alpha/WASourceInfo.java
rename to src/main/java/com/wolfram/alpha/WASourceInfo.java
diff --git a/Source/com/wolfram/alpha/WASubpod.java b/src/main/java/com/wolfram/alpha/WASubpod.java
similarity index 100%
rename from Source/com/wolfram/alpha/WASubpod.java
rename to src/main/java/com/wolfram/alpha/WASubpod.java
diff --git a/Source/com/wolfram/alpha/WAUnits.java b/src/main/java/com/wolfram/alpha/WAUnits.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAUnits.java
rename to src/main/java/com/wolfram/alpha/WAUnits.java
diff --git a/Source/com/wolfram/alpha/WAWarning.java b/src/main/java/com/wolfram/alpha/WAWarning.java
similarity index 100%
rename from Source/com/wolfram/alpha/WAWarning.java
rename to src/main/java/com/wolfram/alpha/WAWarning.java
diff --git a/Source/com/wolfram/alpha/impl/WAAssumptionImpl.java b/src/main/java/com/wolfram/alpha/impl/WAAssumptionImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAAssumptionImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAAssumptionImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAExamplePageImpl.java b/src/main/java/com/wolfram/alpha/impl/WAExamplePageImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAExamplePageImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAExamplePageImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAFutureTopicImpl.java b/src/main/java/com/wolfram/alpha/impl/WAFutureTopicImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAFutureTopicImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAFutureTopicImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAImageImpl.java b/src/main/java/com/wolfram/alpha/impl/WAImageImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAImageImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAImageImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAInfoImpl.java b/src/main/java/com/wolfram/alpha/impl/WAInfoImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAInfoImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAInfoImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WALinkImpl.java b/src/main/java/com/wolfram/alpha/impl/WALinkImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WALinkImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WALinkImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAPlainTextImpl.java b/src/main/java/com/wolfram/alpha/impl/WAPlainTextImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAPlainTextImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAPlainTextImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAPodImpl.java b/src/main/java/com/wolfram/alpha/impl/WAPodImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAPodImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAPodImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAPodStateImpl.java b/src/main/java/com/wolfram/alpha/impl/WAPodStateImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAPodStateImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAPodStateImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAQueryImpl.java b/src/main/java/com/wolfram/alpha/impl/WAQueryImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAQueryImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAQueryImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAQueryParametersImpl.java b/src/main/java/com/wolfram/alpha/impl/WAQueryParametersImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAQueryParametersImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAQueryParametersImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAQueryResultImpl.java b/src/main/java/com/wolfram/alpha/impl/WAQueryResultImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAQueryResultImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAQueryResultImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAReinterpretWarningImpl.java b/src/main/java/com/wolfram/alpha/impl/WAReinterpretWarningImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAReinterpretWarningImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAReinterpretWarningImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WARelatedExampleImpl.java b/src/main/java/com/wolfram/alpha/impl/WARelatedExampleImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WARelatedExampleImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WARelatedExampleImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WARelatedLinkImpl.java b/src/main/java/com/wolfram/alpha/impl/WARelatedLinkImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WARelatedLinkImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WARelatedLinkImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WASoundImpl.java b/src/main/java/com/wolfram/alpha/impl/WASoundImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WASoundImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WASoundImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WASourceInfoImpl.java b/src/main/java/com/wolfram/alpha/impl/WASourceInfoImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WASourceInfoImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WASourceInfoImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WASubpodImpl.java b/src/main/java/com/wolfram/alpha/impl/WASubpodImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WASubpodImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WASubpodImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAUnitsImpl.java b/src/main/java/com/wolfram/alpha/impl/WAUnitsImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAUnitsImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAUnitsImpl.java
diff --git a/Source/com/wolfram/alpha/impl/WAWarningImpl.java b/src/main/java/com/wolfram/alpha/impl/WAWarningImpl.java
similarity index 100%
rename from Source/com/wolfram/alpha/impl/WAWarningImpl.java
rename to src/main/java/com/wolfram/alpha/impl/WAWarningImpl.java
diff --git a/Source/com/wolfram/alpha/net/HttpProvider.java b/src/main/java/com/wolfram/alpha/net/HttpProvider.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/HttpProvider.java
rename to src/main/java/com/wolfram/alpha/net/HttpProvider.java
diff --git a/Source/com/wolfram/alpha/net/HttpProviderFactory.java b/src/main/java/com/wolfram/alpha/net/HttpProviderFactory.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/HttpProviderFactory.java
rename to src/main/java/com/wolfram/alpha/net/HttpProviderFactory.java
diff --git a/Source/com/wolfram/alpha/net/ProxySettings.java b/src/main/java/com/wolfram/alpha/net/ProxySettings.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/ProxySettings.java
rename to src/main/java/com/wolfram/alpha/net/ProxySettings.java
diff --git a/Source/com/wolfram/alpha/net/URLFetcher.java b/src/main/java/com/wolfram/alpha/net/URLFetcher.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/URLFetcher.java
rename to src/main/java/com/wolfram/alpha/net/URLFetcher.java
diff --git a/Source/com/wolfram/alpha/net/WAHttpException.java b/src/main/java/com/wolfram/alpha/net/WAHttpException.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/WAHttpException.java
rename to src/main/java/com/wolfram/alpha/net/WAHttpException.java
diff --git a/Source/com/wolfram/alpha/net/apache/ApacheHttpProvider.java b/src/main/java/com/wolfram/alpha/net/apache/ApacheHttpProvider.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/apache/ApacheHttpProvider.java
rename to src/main/java/com/wolfram/alpha/net/apache/ApacheHttpProvider.java
diff --git a/Source/com/wolfram/alpha/net/apache/ApacheHttpTransaction.java b/src/main/java/com/wolfram/alpha/net/apache/ApacheHttpTransaction.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/apache/ApacheHttpTransaction.java
rename to src/main/java/com/wolfram/alpha/net/apache/ApacheHttpTransaction.java
diff --git a/Source/com/wolfram/alpha/net/impl/HttpTransaction.java b/src/main/java/com/wolfram/alpha/net/impl/HttpTransaction.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/impl/HttpTransaction.java
rename to src/main/java/com/wolfram/alpha/net/impl/HttpTransaction.java
diff --git a/Source/com/wolfram/alpha/net/j2se/J2SEHttpProvider.java b/src/main/java/com/wolfram/alpha/net/j2se/J2SEHttpProvider.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/j2se/J2SEHttpProvider.java
rename to src/main/java/com/wolfram/alpha/net/j2se/J2SEHttpProvider.java
diff --git a/Source/com/wolfram/alpha/net/j2se/J2SEHttpTransaction.java b/src/main/java/com/wolfram/alpha/net/j2se/J2SEHttpTransaction.java
similarity index 100%
rename from Source/com/wolfram/alpha/net/j2se/J2SEHttpTransaction.java
rename to src/main/java/com/wolfram/alpha/net/j2se/J2SEHttpTransaction.java
diff --git a/Source/com/wolfram/alpha/visitor/Visitable.java b/src/main/java/com/wolfram/alpha/visitor/Visitable.java
similarity index 100%
rename from Source/com/wolfram/alpha/visitor/Visitable.java
rename to src/main/java/com/wolfram/alpha/visitor/Visitable.java
diff --git a/Source/com/wolfram/alpha/visitor/Visitor.java b/src/main/java/com/wolfram/alpha/visitor/Visitor.java
similarity index 100%
rename from Source/com/wolfram/alpha/visitor/Visitor.java
rename to src/main/java/com/wolfram/alpha/visitor/Visitor.java