minor tweaks ahead of test restructuring
moved module code to sub-directory to allow for a functional testing app
Merge branch 'master' of https://github.com/schaloner/deadbolt-2-java
split code and functional test app