Convert to workspace w/ submodules