move model to separate package, #2