reform structs/routes