Separate routing from requests
Update Cabal file