Improved separation between route handler and http handler
Renamed classes