Major refactor; separated into modules, updated dependencies to only work with maven 3.1+, fixed issues found when tests were moved.