changes to tiles to get tiles placed in distinct files
resolved merge conflicts