restructure user stories and add acceptance criteria