Tidy up Sitefiles module:
* Roll headers together
* Roll API headers up one directory
* Disable deprecated usage of HTTPClient
Tidy up validators:
* Add missing includes
* Disable use of deprecated HTTPClient