Reorganize imports to better match common style

convention.