Start with pulling out the layer model from the layer classes themselves. In future, Krita/image will only have its own internal layer organization and krita/ui will have two clients that need to be kept in synch with KisImage: KisLayerModel and the shape hierarchy that's now in KisDoc.