moved model to new package