PLF-6049 : Cleanup

* use unified-search and not search
* use ecms instead of wcm
* reorder files
* Add missing calendar entries in exo-sample.properties