Fix order of imports