Move "modules" to "System" menu

resolves #6934