fixes #11 : Modularize room