Refactor of file locations and directives name

removed prefix 'chm' or 'chm' from directive names
Merge branch 'master' of github.com:scbd/chm.cbd.int