Move rooms and services into taxonomy