refactored packaging to match pom definition