Simplified default workspace

Change-Id: I2fc577cc1a74e35ad115d65079a43632df248070