Refactoring directory hierarchy.