Reconfiguring package structure w/ junit tests

Woot version control