Formalise model instance layers
Extract world class to encapsulate entities & instances
Push world member variable up
Code reformat