Refactor Scenery -- ready for new plugins!