Better ordering of the imports in the Api