Room directories

reorganizes room directory