Next wave of refactoring headed for 2.0