Final fix and add module "path" to deps