Separate web handler into modules in preparation for adding more end-points