Inc-397 Restructured namespace in Grid