Got rid of old API  per API files and section stuff as they were starting to get in the way of new code.
WIP push so Stephen can have a look.