Updating pom file. Moving files around. Adding some tests.