Remove api/impl split, make code simpler
Remove api/impl split, make code simpler