refactored packages and renamed jar to be in sync with package refactor