Review of PR 2607

• Explanation of the current code
• Reviewing commit by commit
  • Things done before moving code from C to CPP
  • By directory move the code from C to CPP