Issue984 layer model

Streamline the object tree, ready for adoption of XML as style format