Updated pom files to maven3, updated dependencies and cleaned up