moved around and renamed some models