added model package and seperating files