Fix filenames for case-sensitive systems
Optimize code
Fix filenames for case-sensitive systems