A lot of changes, added pom.xml