Migrated to Maven project