Reorganise imports etc