Enhance folder organization