Tiles related enhancements & reorg.