reorder routes so that submit feature test does not get confused
organise event model methods