Move network stuff to v2 instead of v2_0

Rename network stuff v2

Change-Id: Ia9b8feda20dfd35b0f3712b8e2419d0bf5da0acd
Merge "Move network stuff to v2 instead of v2_0"