Moving java packages and updating gradle build to run unit tests