Extract random name generation
Rename world to model and move to entities
Clean up model