Moving room to separate entity