Moved tools files to C++