Restructuring
-changed folder structures