* Refactoring in internal structure and organization