Reorg and cleanup of generated code
scraper cleanup
ApiBase for creating a class from a generated interface