institutionsApisWrapper refactoring