* Improve file structure.