Rolling back larer refactor, pulling out phrases into groups