Combined Model related Modules

splitting the module class better than the static helper class