added categories and reorganized the  model relationshsips. added new vies