Refactoring the workspace