Phase1 refactor to abstractions, rename, simplify