Update 2 - Tree and Rule merged to definition

Update of CMakeList