minor file layout update
initial workspace management