Update to file structure, update pom.xml