Continuing work to incorporate the infrastructure namespace into the project.
Updated component_graph