Fixed Build

See differences below. I rearrange the project a little bit, to separtae C/C++ and Objective C code.