Rearranging where shortcuts live.