On second thoughts, let's use roomtypes as top.
Remove obsolete header file.
Move sidebar back to includes.