fixing collising bug
cleanning code
adding cmake + various modification