Changed some names to agree with the design document.
Added Tile inside Floor.