move interfaces in model to package