Modified pom.xml and renamed some classes