refactor core -> core/unify/variables