Restructured the model dependencies.