Moved private structure into source file of AgentRegistry, and minor code restructuring