diff --git a/cmd/revid-cli/main.go b/cmd/revid-cli/main.go
index af87b38e..6174e4db 100644
--- a/cmd/revid-cli/main.go
+++ b/cmd/revid-cli/main.go
@@ -36,9 +36,9 @@ import (
 	"strings"
 	"time"
 
+	"bitbucket.org/ausocean/av/container/mts"
+	"bitbucket.org/ausocean/av/container/mts/meta"
 	"bitbucket.org/ausocean/av/revid"
-	"bitbucket.org/ausocean/av/stream/mts"
-	"bitbucket.org/ausocean/av/stream/mts/meta"
 	"bitbucket.org/ausocean/iot/pi/netsender"
 	"bitbucket.org/ausocean/iot/pi/sds"
 	"bitbucket.org/ausocean/iot/pi/smartlogger"
diff --git a/codec/lex/lex.go b/codec/lex/lex.go
index a6275799..9d3bb894 100644
--- a/codec/lex/lex.go
+++ b/codec/lex/lex.go
@@ -35,7 +35,7 @@ import (
 	"io"
 	"time"
 
-	"bitbucket.org/ausocean/av/stream"
+	"bitbucket.org/ausocean/av/container"
 )
 
 var noDelay = make(chan time.Time)
diff --git a/container/mts/encoder.go b/container/mts/encoder.go
index b1e098a4..6f6cada2 100644
--- a/container/mts/encoder.go
+++ b/container/mts/encoder.go
@@ -32,9 +32,9 @@ import (
 	"io"
 	"time"
 
-	"bitbucket.org/ausocean/av/stream/mts/meta"
-	"bitbucket.org/ausocean/av/stream/mts/pes"
-	"bitbucket.org/ausocean/av/stream/mts/psi"
+	"bitbucket.org/ausocean/av/container/mts/meta"
+	"bitbucket.org/ausocean/av/container/mts/pes"
+	"bitbucket.org/ausocean/av/container/mts/psi"
 )
 
 // Some common manifestations of PSI
diff --git a/container/mts/metaEncode_test.go b/container/mts/metaEncode_test.go
index e970b7c8..00f806b9 100644
--- a/container/mts/metaEncode_test.go
+++ b/container/mts/metaEncode_test.go
@@ -31,8 +31,8 @@ import (
 	"bytes"
 	"testing"
 
-	"bitbucket.org/ausocean/av/stream/mts/meta"
-	"bitbucket.org/ausocean/av/stream/mts/psi"
+	"bitbucket.org/ausocean/av/container/mts/meta"
+	"bitbucket.org/ausocean/av/container/mts/psi"
 )
 
 const (
diff --git a/protocol/rtmp/conn.go b/protocol/rtmp/conn.go
index ea8869b9..9b453849 100644
--- a/protocol/rtmp/conn.go
+++ b/protocol/rtmp/conn.go
@@ -39,7 +39,7 @@ import (
 	"strconv"
 	"time"
 
-	"bitbucket.org/ausocean/av/rtmp/amf"
+	"bitbucket.org/ausocean/av/protocol/rtmp/amf"
 )
 
 // Conn represents an RTMP connection.
diff --git a/protocol/rtmp/packet.go b/protocol/rtmp/packet.go
index b28a1cba..5f46851d 100644
--- a/protocol/rtmp/packet.go
+++ b/protocol/rtmp/packet.go
@@ -38,7 +38,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"bitbucket.org/ausocean/av/rtmp/amf"
+	"bitbucket.org/ausocean/av/protocol/rtmp/amf"
 )
 
 // Packet types.
diff --git a/protocol/rtmp/parseurl_test.go b/protocol/rtmp/parseurl_test.go
index 47743693..f6501901 100644
--- a/protocol/rtmp/parseurl_test.go
+++ b/protocol/rtmp/parseurl_test.go
@@ -40,7 +40,7 @@ var parseURLTests = []struct {
 	wantErr      error
 }{
 	{
-		url:      "rtmp://addr",
+		url:     "rtmp://addr",
 		wantErr: errInvalidURL,
 	},
 	{
diff --git a/protocol/rtmp/rtmp.go b/protocol/rtmp/rtmp.go
index 3131380c..dcaefe42 100644
--- a/protocol/rtmp/rtmp.go
+++ b/protocol/rtmp/rtmp.go
@@ -43,7 +43,7 @@ import (
 	"strconv"
 	"time"
 
-	"bitbucket.org/ausocean/av/rtmp/amf"
+	"bitbucket.org/ausocean/av/protocol/rtmp/amf"
 )
 
 const (
diff --git a/protocol/rtmp/rtmp_test.go b/protocol/rtmp/rtmp_test.go
index 8d94ee7e..8ccb2e12 100644
--- a/protocol/rtmp/rtmp_test.go
+++ b/protocol/rtmp/rtmp_test.go
@@ -38,8 +38,8 @@ import (
 	"testing"
 	"time"
 
-	"bitbucket.org/ausocean/av/stream/flv"
-	"bitbucket.org/ausocean/av/stream/lex"
+	"bitbucket.org/ausocean/av/codec/lex"
+	"bitbucket.org/ausocean/av/container/flv"
 )
 
 const (
diff --git a/revid/revid.go b/revid/revid.go
index 198bc547..57704957 100644
--- a/revid/revid.go
+++ b/revid/revid.go
@@ -40,10 +40,10 @@ import (
 	"sync"
 	"time"
 
-	"bitbucket.org/ausocean/av/stream"
-	"bitbucket.org/ausocean/av/stream/flv"
-	"bitbucket.org/ausocean/av/stream/lex"
-	"bitbucket.org/ausocean/av/stream/mts"
+	"bitbucket.org/ausocean/av/codec/lex"
+	"bitbucket.org/ausocean/av/container"
+	"bitbucket.org/ausocean/av/container/flv"
+	"bitbucket.org/ausocean/av/container/mts"
 	"bitbucket.org/ausocean/iot/pi/netsender"
 	"bitbucket.org/ausocean/utils/logger"
 	"bitbucket.org/ausocean/utils/ring"
diff --git a/revid/senders.go b/revid/senders.go
index ac76736e..d0d8d2e8 100644
--- a/revid/senders.go
+++ b/revid/senders.go
@@ -36,9 +36,9 @@ import (
 
 	"github.com/Comcast/gots/packet"
 
-	"bitbucket.org/ausocean/av/rtmp"
-	"bitbucket.org/ausocean/av/stream/mts"
-	"bitbucket.org/ausocean/av/stream/rtp"
+	"bitbucket.org/ausocean/av/container/mts"
+	"bitbucket.org/ausocean/av/protocol/rtmp"
+	"bitbucket.org/ausocean/av/protocol/rtp"
 	"bitbucket.org/ausocean/iot/pi/netsender"
 	"bitbucket.org/ausocean/utils/logger"
 	"bitbucket.org/ausocean/utils/ring"
diff --git a/revid/senders_test.go b/revid/senders_test.go
index ad4a18ba..b75848c4 100644
--- a/revid/senders_test.go
+++ b/revid/senders_test.go
@@ -37,8 +37,8 @@ import (
 	"github.com/Comcast/gots/packet"
 	"github.com/Comcast/gots/pes"
 
-	"bitbucket.org/ausocean/av/stream/mts"
-	"bitbucket.org/ausocean/av/stream/mts/meta"
+	"bitbucket.org/ausocean/av/container/mts"
+	"bitbucket.org/ausocean/av/container/mts/meta"
 	"bitbucket.org/ausocean/utils/logger"
 	"bitbucket.org/ausocean/utils/ring"
 )