Group DEMO modules in maven properly

Demo parent was not in demo group.  Fixed that.