Moved Model objects into another package.