Restructured main pom file