reorganise closes #125