Restructuring folder structures