Updated Aliases

Moved some aliases and added some new ones.
They are only sorted alphabetically in their respective groups.