reflect new workspace structure