Refactor Grid client side package structure (#13334)

Change-Id: Iab81d2344480d2b60303172a96f4e5e4fa8e1623