diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go
index 5e4b5bad..46c7af4f 100644
--- a/router/ethernet_decoder.go
+++ b/router/ethernet_decoder.go
@@ -8,6 +8,13 @@ import (
 	"net"
 )
 
+type EthernetDecoder struct {
+	eth     layers.Ethernet
+	ip      layers.IPv4
+	decoded []gopacket.LayerType
+	parser  *gopacket.DecodingLayerParser
+}
+
 func NewEthernetDecoder() *EthernetDecoder {
 	dec := &EthernetDecoder{}
 	dec.parser = gopacket.NewDecodingLayerParser(layers.LayerTypeEthernet, &dec.eth, &dec.ip)
diff --git a/router/types.go b/router/types.go
index ec221088..181143c6 100644
--- a/router/types.go
+++ b/router/types.go
@@ -1,7 +1,6 @@
 package router
 
 import (
-	"code.google.com/p/gopacket"
 	"code.google.com/p/gopacket/layers"
 	"net"
 	"sync"
@@ -89,13 +88,6 @@ type UDPPacket struct {
 	Sender *net.UDPAddr
 }
 
-type EthernetDecoder struct {
-	eth     layers.Ethernet
-	ip      layers.IPv4
-	decoded []gopacket.LayerType
-	parser  *gopacket.DecodingLayerParser
-}
-
 type MsgTooBigError struct {
 	PMTU int // actual pmtu, i.e. what the kernel told us
 }