diff --git a/app/api_listtopology.go b/app/api_listtopology.go
index a361fbc16..c484dea82 100644
--- a/app/api_listtopology.go
+++ b/app/api_listtopology.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 // APITopologyDesc is returned in a list by the /api/topology handler.
diff --git a/app/api_report_test.go b/app/api_report_test.go
index aa178dbc0..737a9173c 100644
--- a/app/api_report_test.go
+++ b/app/api_report_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func TestAPIReport(t *testing.T) {
diff --git a/app/api_topology.go b/app/api_topology.go
index b2a6e537e..609893257 100644
--- a/app/api_topology.go
+++ b/app/api_topology.go
@@ -9,7 +9,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 const (
diff --git a/app/api_topology_test.go b/app/api_topology_test.go
index 2de2a1c9c..bd0848971 100644
--- a/app/api_topology_test.go
+++ b/app/api_topology_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func TestAPITopologyApplications(t *testing.T) {
diff --git a/app/main.go b/app/main.go
index ea13c1178..2c9d34c64 100644
--- a/app/main.go
+++ b/app/main.go
@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {
diff --git a/app/mock_reporter_test.go b/app/mock_reporter_test.go
index 0d1768c21..c3740d0e5 100644
--- a/app/mock_reporter_test.go
+++ b/app/mock_reporter_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"net"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 // StaticReport is used as know test data in api tests.
diff --git a/app/report_lifo.go b/app/report_lifo.go
index db49a89ef..9bdc9b7c3 100644
--- a/app/report_lifo.go
+++ b/app/report_lifo.go
@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 // Reporter is something which generates a single 'current' report over a
diff --git a/app/router.go b/app/router.go
index f87420ac7..d6b6b8e7b 100644
--- a/app/router.go
+++ b/app/router.go
@@ -1,11 +1,11 @@
-// HTTP server routing table
 package main
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/weaveworks/scope/scope/report"
+
+	"github.com/weaveworks/scope/report"
 )
 
 // Router gives of the HTTP dispatcher. It will always use the embedded HTML
diff --git a/experimental/bridge/main.go b/experimental/bridge/main.go
index 07489066d..93277fb94 100644
--- a/experimental/bridge/main.go
+++ b/experimental/bridge/main.go
@@ -12,8 +12,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 const (
diff --git a/experimental/demoprobe/generate.go b/experimental/demoprobe/generate.go
index a1a7e1011..0aa57a58a 100644
--- a/experimental/demoprobe/generate.go
+++ b/experimental/demoprobe/generate.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func init() {
diff --git a/experimental/demoprobe/main.go b/experimental/demoprobe/main.go
index bfa9e69d8..28548ea93 100644
--- a/experimental/demoprobe/main.go
+++ b/experimental/demoprobe/main.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {
diff --git a/experimental/fixprobe/main.go b/experimental/fixprobe/main.go
index 43992153a..47ee9b19f 100644
--- a/experimental/fixprobe/main.go
+++ b/experimental/fixprobe/main.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {
diff --git a/experimental/genreport/generate.go b/experimental/genreport/generate.go
index 208354362..4fddb417c 100644
--- a/experimental/genreport/generate.go
+++ b/experimental/genreport/generate.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func init() {
diff --git a/experimental/graphviz/handle.go b/experimental/graphviz/handle.go
index 29da36d97..39ae2ac04 100644
--- a/experimental/graphviz/handle.go
+++ b/experimental/graphviz/handle.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func handleTXT(r Reporter) http.HandlerFunc {
diff --git a/experimental/graphviz/main.go b/experimental/graphviz/main.go
index cfe0ed296..67ac84946 100644
--- a/experimental/graphviz/main.go
+++ b/experimental/graphviz/main.go
@@ -12,7 +12,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {
diff --git a/experimental/graphviz/report_lifo.go b/experimental/graphviz/report_lifo.go
index 8f83a0d1a..c785e24d7 100644
--- a/experimental/graphviz/report_lifo.go
+++ b/experimental/graphviz/report_lifo.go
@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 // Copy/paste from app/report_lifo.go
diff --git a/experimental/oneshot/main.go b/experimental/oneshot/main.go
index b7805c2f3..01c645a4d 100644
--- a/experimental/oneshot/main.go
+++ b/experimental/oneshot/main.go
@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {
diff --git a/integration/easy_test.go b/integration/easy_test.go
index eb6193def..768ca52c2 100644
--- a/integration/easy_test.go
+++ b/integration/easy_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func TestComponentsAreAvailable(t *testing.T) {
diff --git a/probe/main.go b/probe/main.go
index 9e227c0d2..ba4fe4d98 100644
--- a/probe/main.go
+++ b/probe/main.go
@@ -15,8 +15,8 @@ import (
 	"time"
 
 	"github.com/weaveworks/procspy"
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {
diff --git a/probe/spy.go b/probe/spy.go
index 58b33c0af..38c80a32e 100644
--- a/probe/spy.go
+++ b/probe/spy.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/weaveworks/procspy"
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 // spy invokes procspy.Connections to generate a report.Report that contains
diff --git a/probe/spy_test.go b/probe/spy_test.go
index ecfacf3ea..18c7dbfe0 100644
--- a/probe/spy_test.go
+++ b/probe/spy_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/weaveworks/procspy"
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func TestScopedIP(t *testing.T) {
diff --git a/xfer/collector.go b/xfer/collector.go
index ff361b21b..8ac6631a9 100644
--- a/xfer/collector.go
+++ b/xfer/collector.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 const (
diff --git a/xfer/collector_test.go b/xfer/collector_test.go
index 464b2c0ad..f83947135 100644
--- a/xfer/collector_test.go
+++ b/xfer/collector_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func TestCollector(t *testing.T) {
diff --git a/xfer/merge_test.go b/xfer/merge_test.go
index fb44808f0..4fd8c90f0 100644
--- a/xfer/merge_test.go
+++ b/xfer/merge_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func TestMerge(t *testing.T) {
diff --git a/xfer/publisher.go b/xfer/publisher.go
index 64f3b4734..6a89298de 100644
--- a/xfer/publisher.go
+++ b/xfer/publisher.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 // Publisher provides a way to send reports upstream.
diff --git a/xfer/publisher_test.go b/xfer/publisher_test.go
index 737538461..5b25130af 100644
--- a/xfer/publisher_test.go
+++ b/xfer/publisher_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/report"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func TestTCPPublisher(t *testing.T) {