Make EditorWorkspace have a Workspace (rather than be one)