added structure to the classes