Deleted and Added and Changed some main classes