Add initial structure of classes