Update shortcuts and helpers as needed
Move some temporary aliases to proper locations