Revert "Changing Vivastreet namespace to W3"

This reverts commit 675528df955d13c2b6365b4a70f078613282d6fa.