Reorganize imports