- refactoring and reorganization