Move the router loading pretty much back to it's original location, after git had quit an argument with, well, git actually