Reorganized file structure for overview