Beginnings of the Great Refactoring