Rearranged a few files to make things a bit cleaner

Also fixed a bug in one of CRestApiHelper's MakeAPIRequest overloaded
methods (the one with multiple parameters was not passing along the
sContentType value preventing the return of JSON data)