Workspace Fixed

Fixed workspace after refactor