Merge branch '97-test_issue_2_tim' into 'dev_cpp_code_conversion'

folders where deleted back to current state

See merge request !19
1 job for 99-test_issue_3_tim in 1 minute and 17 seconds (queued for 2 seconds)