Refactoring directory naming convention.