Reorganized folder structures