ModuleDescriptionFile renamed to ModuleDescriptor
Separated ModuleDescriptor methods into a more generic Descriptor class