Change the way routes are loaded to fix #5