Merge "Add ModuleInfo class"