Include Grid class and Rename Position class