Major refactoring has happened