Restructuring and refactoring.