Merge "Moved Flexibleplugin to MS folder"