Restructured the pom.xml as well as updated the links