refactor(external-api-modules): Refactor externa-api modules