Migrated to pure Java project
Merged