Updated module paths