refactored the routes

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
pushing notifications! yay

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>