Added model classes and modified package