Migrated to Gradle, optimized imports across projects