Enhance folder structure