Migrating to maven