Reorganise base/normalize