Misc cleanup, add default 'workspace' directory