Ended the design refactoring.