Add wardudes.
Reorganise units entries.