Modularization effort v2

[TheSnoozer]

Context

See: #228

Contributor Checklist

• Added relevant integration or unit tests to verify the changes
• Update the Readme or any other documentation (including relevant Javadoc)
• Ensured that tests pass locally: mvn clean package
• Ensured that the code meets the current checkstyle coding style definition: mvn clean verify -Pcheckstyle -Dmaven.test.skip=true -B

[TheSnoozer]

Travis seems to work, only coveralls is complaining....Since this is a pretty old feature request I just go ahead and merge and see what happens.