optimized the files and their structure