Moved DataGrid Code to Module