Re-organize xmlns declarations