Sort, add shorthands
Bump submodules