A little refactoring to make structure a bit cleaner

Also adding 'requests' dependency. Who uses httplib anymore?