Rearranging config files
Updating mail pointer
Fixing up broken routes