Refactoring directory structure.