Fixed errors introduced with incorrect references to classes.
Restored files that had been deleted that are REQUIRED