Reorganise things for the better