Refactoring and restructuring.