modify map id, name ande CLMessage
remove CLMessage directory
some modify