PBSW Structure Reorganisation