Bug fix: Move to cpp directory