Added structure of classes