Re-org source for types
Clean up apibase
Rename makeRequest to mkRequest

Two less characters!! Yaaaaaa!