Updated imports, removed self.generator declarations, removed self.generator parameters from instantiations
Updated imports, removed self.generator declarations, removed self.generator parameters from instantiations

MAECProject/gfi-sandbox-to-maec