Change the structure to complete C++