Refactoring and reorganizing.