Migrated to maven build support