sort and add more modules
add cherry-pick shortcut