fixed cil imports

I accidentally broke the cil semantics when I reorganized the folder structure.

@andreistefanescu please review