Reorganized file structure.