Minor Changes to Model.  Moved in folder struct