Reorganise the IntPSQ module