Added package and model classes
Merge branch 'package-and-model'