diff --git a/examples/00-authentication.go b/examples/00-authentication.go
index 00dc90f..941b3fb 100644
--- a/examples/00-authentication.go
+++ b/examples/00-authentication.go
@@ -16,7 +16,7 @@ package main
 
 import (
 	"fmt"
-	"git.openstack.org/stackforge/golang-client.git/identity"
+	"git.openstack.org/stackforge/golang-client.git/identity/v2"
 	"time"
 )
 
diff --git a/examples/10-objectstore.go b/examples/10-objectstore.go
index 94823d3..12d9897 100644
--- a/examples/10-objectstore.go
+++ b/examples/10-objectstore.go
@@ -18,8 +18,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"git.openstack.org/stackforge/golang-client.git/identity"
-	"git.openstack.org/stackforge/golang-client.git/objectstorage"
+	"git.openstack.org/stackforge/golang-client.git/identity/v2"
+	"git.openstack.org/stackforge/golang-client.git/objectstorage/v1"
 	"io/ioutil"
 	"time"
 )
diff --git a/identity/auth.go b/identity/v2/auth.go
similarity index 100%
rename from identity/auth.go
rename to identity/v2/auth.go
diff --git a/objectstorage/objectstorage.go b/objectstorage/v1/objectstorage.go
similarity index 100%
rename from objectstorage/objectstorage.go
rename to objectstorage/v1/objectstorage.go
diff --git a/objectstorage/objectstorage_test.go b/objectstorage/v1/objectstorage_test.go
similarity index 99%
rename from objectstorage/objectstorage_test.go
rename to objectstorage/v1/objectstorage_test.go
index 21071e8..02bfc51 100644
--- a/objectstorage/objectstorage_test.go
+++ b/objectstorage/v1/objectstorage_test.go
@@ -16,7 +16,7 @@ package objectstorage_test
 
 import (
 	"errors"
-	"git.openstack.org/stackforge/golang-client.git/objectstorage"
+	"git.openstack.org/stackforge/golang-client.git/objectstorage/v1"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"