deleted editmodel and editmodeltest, and changed some classes due to the deletations