Alphabetized and added some missing modules.