Fix to module paths