Move router class to helpers directory, update references