CMS-4152 Flatten directory structure for components