CWS restructure