CMS-2669 Changes in directory structure for components