Reorganise commonly used XML tags