Moved Entities and Components around a bit.
Fixed Room class.