Add Tile class and remove x / y