Code reorg for agent/services