Use C++ everywhere
Move from lib to src