refactoring workspace