Rework AGI namespace

Change-Id: If92474dbc3ddf7de4f531e864353edca88327299
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>