changing demo to follow new module pattern