Major refactoring
Reworked to workspace
Working on workspace refactoring
Refactoring done...I think