Move grid to separate file