fix headers and minor changes
rename to cpp
fix build after rename