Optimize folder structure