Added cfg folder
Solved merge conflict
merge
some compilation fixes