Menu Cleanup.  Major streamline of the menus with changes to the module.xml.