PS-29 Reorganisation of packages, fixed location cluster bug