Workspace

Modified the workspace structure.