reconstruct code hierarchy.

add a new checkbox control.