Refactoring directory architecture.