Move CPP logic into separate module for #192