Reorganized file organization.