Rearange CMS to CMS form selectors folders