Reorganize workspace structure