diff --git a/README.md b/README.md
index c163f09e34..e1fdbf8c30 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# lpms
-Livepeer media server
+# LPMS - Livepeer media server
 
-Currently it's not yet a stand-alone server.  The goal of this project is to create an open source media server that handles live stream video transcoding at scale.
+This is meant to be a standalone server, but at the moment it is
+coupled with the go-livepeer repo. For the time being development will
+proceed at the
+[github.com/livepeer/go-livepeer/lpms package](https://github.com/livepeer/go-livepeer/lpms).
diff --git a/io/io.go b/io/io.go
index 7012da5c36..f69a496386 100644
--- a/io/io.go
+++ b/io/io.go
@@ -16,7 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
-	"github.com/ethereum/go-ethereum/swarm/storage/streaming"
+	"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
 	"github.com/golang/groupcache/lru"
 	"github.com/kz26/m3u8"
 	lpmsCommon "github.com/livepeer/lpms/common"
diff --git a/lpms.go b/lpms.go
index 4099b9a974..23a452d357 100644
--- a/lpms.go
+++ b/lpms.go
@@ -8,9 +8,9 @@
 package lpms
 
 import (
-	"github.com/ethereum/go-ethereum/swarm/network"
-	"github.com/ethereum/go-ethereum/swarm/storage"
-	"github.com/ethereum/go-ethereum/swarm/storage/streaming"
+	"github.com/livepeer/go-livepeer/livepeer/network"
+	"github.com/livepeer/go-livepeer/livepeer/storage"
+	"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
 	"github.com/livepeer/lpms/common"
 	"github.com/livepeer/lpms/server"
 	streamingVizClient "github.com/livepeer/streamingviz/client"
diff --git a/server/httpServer.go b/server/httpServer.go
index 2005347dff..0beb6a3488 100644
--- a/server/httpServer.go
+++ b/server/httpServer.go
@@ -14,10 +14,10 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
-	"github.com/ethereum/go-ethereum/swarm/network"
+	"github.com/livepeer/go-livepeer/livepeer/network"
 	"github.com/ethereum/go-ethereum/swarm/network/kademlia"
-	"github.com/ethereum/go-ethereum/swarm/storage"
-	"github.com/ethereum/go-ethereum/swarm/storage/streaming"
+	"github.com/livepeer/go-livepeer/livepeer/storage"
+	"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
 	lpmsIo "github.com/livepeer/lpms/io"
 	streamingVizClient "github.com/livepeer/streamingviz/client"
 	"github.com/nareix/joy4/format/flv"
diff --git a/server/rtmpServer.go b/server/rtmpServer.go
index 264f55debe..25f88f4b39 100644
--- a/server/rtmpServer.go
+++ b/server/rtmpServer.go
@@ -10,8 +10,8 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
 	"github.com/ethereum/go-ethereum/swarm/network/kademlia"
-	"github.com/ethereum/go-ethereum/swarm/storage"
-	"github.com/ethereum/go-ethereum/swarm/storage/streaming"
+	"github.com/livepeer/go-livepeer/livepeer/storage"
+	"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
 	"github.com/livepeer/lpms/io"
 	"github.com/livepeer/lpms/types"
 	streamingVizClient "github.com/livepeer/streamingviz/client"