Fixed module paths