Workspace refactoring.