Adding commonsource directory to CPP version of PWagner project