Restructure to have distinct local and remote workspaces