Merged API and implementation to one bundle