Migrated to gradle and refactored classnames