Renaming and reorganisation of classes