EZP-22438: Finished refactoring API/Core