Restructured folders for future additions