move model to separate package