Refactored for packages and classes
Merge pull request #5 from aditishetty/ModelObject

Refactored for packages and classes