Improvement folder structure