[TASK] Merge submodule workspaces into core