Updated to use the new module paths
Updated to use the new module paths