Optimize file structure

...