Reorganisation of Mainclass