Separate out all the horrible inner classes
Changed the logging to use slf4
Deleted all the pointless javadoc
Updated license information everywhere