Reorganize the imports in the .stores subpackage