Minor code revision
Workspace restructuring