renamed packages and model uri's