Minor refactoring
Request handling with routes
EndPoint