Merged LayerScope and Scope classes