Fix package folder and pom