Reorganisation of the class
Delete old file