moved some rooms around

put things in their proper place