refs #18 ##20 -- move user model generator into main generator