Revert "Revert "workspace""

This reverts commit 293ea8b61cb0822914b98d2995f8288cbe7691a9.