More restructuring (windows)