Refactoring, moving to maven.