Added messages, cleaned up templates, and moved around files.  Also added redirects