Refactoring and redirects.
Refactoring and redirects.