moved files into model package