Revised room model.

Removed one layer of object hierarchy. The TestConditionalConstructions do not yet work in this commit.