reorganisation of classes