almost fix ex2
have cmakefiles removed
fix conflicts?