Changed directory names for generated code that is now getting a conflict, I believe because
we import Matchers instead of mixing it in now.