Refactor to supply ballot addition form with a native organisation structure, which it can internally reorganise