More workspace restructure