Minor modifiaction in directory stracture and added Cmake