Added some structure of classes