Package changes to match requirements from uploading to maven central