Migrated util and model into separate classes