Refactoring of the directory structure.