Moved models from guvnor-ng and made 'Bean' unique to keep IDEA happy