Finalized cpp
Proper folders