Add appropriate redirects and a bit of cleanup.