folder hierarchy refactoring