[ref] First split into classes