Fix Maven Structure and Pom