Refactored API to use the extension instead of the old version.
Refactored extensions into multiple files