NOJIRA:  Refactor the demo service into a new package;  mark service impls as final where appropriate