Refactoring the workspace services.