2.0 (C and XS split to separate files)