Reconfiguring package structure w/ junit tests