Add main tag and remove group.

Add main tag and remove group.