Fix order of import statements