Refactor to add geowave-core rpm