refactoring, add JIRM demos