changing router functions to import upwards