Keywords Refactor for PSR-0 Autoload and some PSR-2 changes

Also misc changes to redirects module to better align with other modules