Refactoring aome classes (mergers)