move common models out of module