Adjust to fix circular dependencies
Adjust to fix circular dependencies

bleib1dj/neomodel,robinedwards/neomodel,cristigociu/neomodel_dh,wcooley/neomodel,andrefsp/neomodel,bleib1dj/neomodel,fpieper/neomodel,robinedwards/neomodel,pombredanne/neomodel