Extract new sources into oC root dir. Fixes #1683 #1561