Finished preliminary changes of the infrastructure namespace.
Working now on the data_containers.