CMS-4153 Update sample-modules with flatten directory structure