Refactoring of file structure.