re-organised C and XQuery files