Add c and c++ files
Refactor fixes
Add cython modules