Add parent and child ids in fields c_id and parent_id. Make ids a generated
number for easier reading.
Merge branch 'ISSUE-163-code-cleanup' into current-sprint