Adapt CSLib changes, bugfixes
Reformat Workspace