Refactored router code so routes are only defined once in the config file - #4