Refactoring of workspace