Moved 'data' namespace out of 'agent'