refactoring workspace...