Redo import statements

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.

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) {

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 (

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) {

app/main.go

@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {

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.

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

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

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 (

experimental/demoprobe/generate.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func init() {

experimental/demoprobe/main.go

@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {

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() {

experimental/genreport/generate.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 func init() {

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 {

experimental/graphviz/main.go

@@ -12,7 +12,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/weaveworks/scope/scope/xfer"
+	"github.com/weaveworks/scope/xfer"
 )
 
 func main() {

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

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() {

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) {

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() {

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

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) {

xfer/collector.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/weaveworks/scope/scope/report"
+	"github.com/weaveworks/scope/report"
 )
 
 const (

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) {

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) {

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.

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) {