updating models for simpler relationships
updating forms and views for new model architecture