Refactoring
Changed hierarchy