changed filestructure for C++ wrapper