diff --git a/mpegts/MpegTs.go b/mpegts/MpegTs.go
index 26833d9e..3bf71fdf 100644
--- a/mpegts/MpegTs.go
+++ b/mpegts/MpegTs.go
@@ -29,8 +29,8 @@ LICENSE
 package mpegts
 
 import (
-	//"bitbucket.org/ausocean/av/tools"
-	"../tools"
+	"bitbucket.org/ausocean/av/tools"
+	//"../tools"
 
 	"errors"
 	//"fmt"
diff --git a/parser/H264Writer.go b/parser/H264Writer.go
index 7874a567..a6989cd5 100644
--- a/parser/H264Writer.go
+++ b/parser/H264Writer.go
@@ -32,14 +32,14 @@ import (
   _"fmt"
   "os"
 
-  //"bitbucket.org/ausocean/av/mpegts"
-  //"bitbucket.org/ausocean/av/rtp"
-  //"bitbucket.org/ausocean/av/tools"
-  //"bitbucket.org/ausocean/av/itut"
-  "../mpegts"
-  "../rtp"
-  "../tools"
-  "../itut"
+  "bitbucket.org/ausocean/av/mpegts"
+  "bitbucket.org/ausocean/av/rtp"
+  "bitbucket.org/ausocean/av/tools"
+  "bitbucket.org/ausocean/av/itut"
+  //"../mpegts"
+  //"../rtp"
+  //"../tools"
+  //"../itut"
 )
 
 type RtpToH264Converter interface {
diff --git a/parser/Parser.go b/parser/Parser.go
index 636197c8..24e590e7 100644
--- a/parser/Parser.go
+++ b/parser/Parser.go
@@ -28,8 +28,8 @@ LICENSE
 package parser
 
 import (
-  //"bitbucket.org/ausocean/av/itut"
-  "../itut"
+  "bitbucket.org/ausocean/av/itut"
+  //"../itut"
   "log"
   "sync"
   "fmt"
diff --git a/pes/Pes.go b/pes/Pes.go
index c558d015..413c1732 100644
--- a/pes/Pes.go
+++ b/pes/Pes.go
@@ -27,8 +27,8 @@ LICENSE
 package pes
 
 import (
-	//"bitbucket.org/ausocean/av/tools"
-	"../tools"
+	"bitbucket.org/ausocean/av/tools"
+	//"../tools"
 )
 
 const (
diff --git a/revid/RevidInstance.go b/revid/RevidInstance.go
index 36e58c69..bc78f246 100644
--- a/revid/RevidInstance.go
+++ b/revid/RevidInstance.go
@@ -42,15 +42,15 @@ import (
 	"strconv"
 	"time"
 
-	//"bitbucket.org/ausocean/av/h264"
-	//"bitbucket.org/ausocean/av/tsgenerator"
-	"../parser"
-	"../tsgenerator"
+	"bitbucket.org/ausocean/av/h264"
+	"bitbucket.org/ausocean/av/tsgenerator"
+	//"../parser"
+	//"../tsgenerator"
 
-	//"bitbucket.org/ausocean/av/ringbuffer"
-	//"bitbucket.org/ausocean/utils/smartLogger"
-	"../../utils/smartLogger"
-	"../ringbuffer"
+	"bitbucket.org/ausocean/av/ringbuffer"
+	"bitbucket.org/ausocean/utils/smartLogger"
+	//"../../utils/smartLogger"
+	//"../ringbuffer"
 )
 
 // Misc constants
diff --git a/tools/helpers.go b/tools/helpers.go
index 638de03e..b5951b2b 100644
--- a/tools/helpers.go
+++ b/tools/helpers.go
@@ -31,8 +31,8 @@ package tools
 import (
 	_"os"
 	_"fmt"
-	//"bitbucket.org/ausocean/av/rtp"
-	"../rtp"
+	"bitbucket.org/ausocean/av/rtp"
+	//"../rtp"
 )
 
 func BoolToByte(in bool) (out byte) {
diff --git a/tsgenerator/TsGenerator.go b/tsgenerator/TsGenerator.go
index 381d110e..fe7d0624 100644
--- a/tsgenerator/TsGenerator.go
+++ b/tsgenerator/TsGenerator.go
@@ -31,14 +31,14 @@ package tsgenerator
 import (
 	_"fmt"
 	_"os"
-	//"bitbucket.org/ausocean/av/mpegts"
-	//"bitbucket.org/ausocean/av/pes"
-	//"bitbucket.org/ausocean/av/tools"
-	//"bitbucket.org/ausocean/av/rtp"
-	"../mpegts"
-	"../pes"
-	"../tools"
-	"../rtp"
+	"bitbucket.org/ausocean/av/mpegts"
+	"bitbucket.org/ausocean/av/pes"
+	"bitbucket.org/ausocean/av/tools"
+	"bitbucket.org/ausocean/av/rtp"
+	//"../mpegts"
+	//"../pes"
+	//"../tools"
+	//"../rtp"
 )
 
 var (