Refactoring workspace (v0.2)