Change the import order