Moved Grid object into its own file