Fix alphabetical order
Add new modules