Re-organize imports