Refactored the routes

Signed-off-by: Evan Tedesco <evantedesco@gmail.com>