Restructuring.
Refactoring.
Refactoring.
Refactoring.