Add CHM and reorganize