restructure packages and tidy up
Merge branch 'master' of https://github.com/MRUOC/verifone
add log4j config