Fix PIMPL
Fix inconsistent file extensions