diff --git a/acceptance/openstack/blockstorage/v2/extensions/extensions.go b/acceptance/openstack/blockstorage/extensions/extensions.go
similarity index 97%
rename from acceptance/openstack/blockstorage/v2/extensions/extensions.go
rename to acceptance/openstack/blockstorage/extensions/extensions.go
index 685f769..05a3e12 100644
--- a/acceptance/openstack/blockstorage/v2/extensions/extensions.go
+++ b/acceptance/openstack/blockstorage/extensions/extensions.go
@@ -7,7 +7,7 @@
 	"testing"
 
 	"github.com/gophercloud/gophercloud"
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/extensions/volumeactions"
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 )
diff --git a/acceptance/openstack/blockstorage/v2/extensions/pkg.go b/acceptance/openstack/blockstorage/extensions/pkg.go
similarity index 70%
rename from acceptance/openstack/blockstorage/v2/extensions/pkg.go
rename to acceptance/openstack/blockstorage/extensions/pkg.go
index 89d906d..f18039d 100644
--- a/acceptance/openstack/blockstorage/v2/extensions/pkg.go
+++ b/acceptance/openstack/blockstorage/extensions/pkg.go
@@ -1,3 +1,3 @@
-// The extensions package contains acceptance tests for the Openstack Cinder V2 extensions service.
+// The extensions package contains acceptance tests for the Openstack Cinder extensions service.
 
 package extensions
diff --git a/acceptance/openstack/blockstorage/v2/extensions/volumeactions_test.go b/acceptance/openstack/blockstorage/extensions/volumeactions_test.go
similarity index 100%
rename from acceptance/openstack/blockstorage/v2/extensions/volumeactions_test.go
rename to acceptance/openstack/blockstorage/extensions/volumeactions_test.go
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/doc.go b/openstack/blockstorage/extensions/volumeactions/doc.go
similarity index 100%
rename from openstack/blockstorage/v2/extensions/volumeactions/doc.go
rename to openstack/blockstorage/extensions/volumeactions/doc.go
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/requests.go b/openstack/blockstorage/extensions/volumeactions/requests.go
similarity index 100%
rename from openstack/blockstorage/v2/extensions/volumeactions/requests.go
rename to openstack/blockstorage/extensions/volumeactions/requests.go
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/results.go b/openstack/blockstorage/extensions/volumeactions/results.go
similarity index 100%
rename from openstack/blockstorage/v2/extensions/volumeactions/results.go
rename to openstack/blockstorage/extensions/volumeactions/results.go
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/testing/doc.go b/openstack/blockstorage/extensions/volumeactions/testing/doc.go
similarity index 100%
rename from openstack/blockstorage/v2/extensions/volumeactions/testing/doc.go
rename to openstack/blockstorage/extensions/volumeactions/testing/doc.go
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/testing/fixtures.go b/openstack/blockstorage/extensions/volumeactions/testing/fixtures.go
similarity index 100%
rename from openstack/blockstorage/v2/extensions/volumeactions/testing/fixtures.go
rename to openstack/blockstorage/extensions/volumeactions/testing/fixtures.go
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/testing/requests_test.go b/openstack/blockstorage/extensions/volumeactions/testing/requests_test.go
similarity index 96%
rename from openstack/blockstorage/v2/extensions/volumeactions/testing/requests_test.go
rename to openstack/blockstorage/extensions/volumeactions/testing/requests_test.go
index 38a5bd2..f47d773 100644
--- a/openstack/blockstorage/v2/extensions/volumeactions/testing/requests_test.go
+++ b/openstack/blockstorage/extensions/volumeactions/testing/requests_test.go
@@ -4,7 +4,7 @@
 	"testing"
 
 	"github.com/gophercloud/gophercloud"
-	"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/extensions/volumeactions"
+	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
 	th "github.com/gophercloud/gophercloud/testhelper"
 	"github.com/gophercloud/gophercloud/testhelper/client"
 )
diff --git a/openstack/blockstorage/v2/extensions/volumeactions/urls.go b/openstack/blockstorage/extensions/volumeactions/urls.go
similarity index 100%
rename from openstack/blockstorage/v2/extensions/volumeactions/urls.go
rename to openstack/blockstorage/extensions/volumeactions/urls.go