Collapsed some required modules into their parent moduled
Resolved a missed conflict