Restructered folders/packages and pom.xml