Reorganized file structure