reorganized files to be in Model folder