Added file structure for classes