remove 16 sonar issues, reorganize java classes of cms, remove duplication