Small fix
Changed file names from .cpp to .cxx
Small build system fix