Moved files correctly
Moved to C++

For better performace