"Fixing" imports with directories.
Merge branch 'master' into coq-semantics