Merged with new file structure for api classes