updated classes in the header and import section in class file