Reorganized file structure for scalability