Initial changes

Minor changes to package layout, comments, junit tests
Removed