Migrated config to the new format
Cleaned up imports