I often start from scratch (deleting the rooms until the new room appears in the correct place) when I need to overcome that issue.
I recommend laying out the templates for X and Y in the main room first and keeping those layouts in case of this situation, it doesn't take too long then to recreate it.
]]>