reorganise into class