Correct namespacing and menu organization.