diff --git a/bitswap/bitswap.go b/bitswap/bitswap.go
index b645fabb2..56b3db955 100644
--- a/bitswap/bitswap.go
+++ b/bitswap/bitswap.go
@@ -6,6 +6,7 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
 
+	bsmsg "github.com/jbenet/go-ipfs/bitswap/message"
 	notifications "github.com/jbenet/go-ipfs/bitswap/notifications"
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	swarm "github.com/jbenet/go-ipfs/net/swarm"
@@ -119,7 +120,7 @@ func (bs *BitSwap) getBlock(k u.Key, p *peer.Peer, timeout time.Duration) (*bloc
 	ctx, _ := context.WithTimeout(context.Background(), timeout)
 	blockChannel := bs.notifications.Subscribe(ctx, k)
 
-	message := newMessage()
+	message := bsmsg.New()
 	message.AppendWanted(k)
 	bs.meschan.Outgoing <- message.ToSwarm(p)
 
@@ -148,7 +149,7 @@ func (bs *BitSwap) HaveBlock(blk *blocks.Block) error {
 }
 
 func (bs *BitSwap) SendBlock(p *peer.Peer, b *blocks.Block) {
-	message := newMessage()
+	message := bsmsg.New()
 	message.AppendBlock(b)
 	bs.meschan.Outgoing <- message.ToSwarm(p)
 }
@@ -157,7 +158,7 @@ func (bs *BitSwap) handleMessages() {
 	for {
 		select {
 		case mes := <-bs.meschan.Incoming:
-			bsmsg, err := FromSwarm(*mes)
+			bsmsg, err := bsmsg.FromSwarm(*mes)
 			if err != nil {
 				u.PErr("%v\n", err)
 				continue
@@ -250,7 +251,7 @@ func (bs *BitSwap) getLedger(p *peer.Peer) *Ledger {
 }
 
 func (bs *BitSwap) SendWantList(wl KeySet) error {
-	message := newMessage()
+	message := bsmsg.New()
 	for k, _ := range wl {
 		message.AppendWanted(k)
 	}
diff --git a/bitswap/message.go b/bitswap/message/message.go
similarity index 97%
rename from bitswap/message.go
rename to bitswap/message/message.go
index 0853668b8..d5ad94643 100644
--- a/bitswap/message.go
+++ b/bitswap/message/message.go
@@ -1,4 +1,4 @@
-package bitswap
+package message
 
 import (
 	proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
@@ -33,7 +33,7 @@ func newMessageFromProto(pb PBMessage) *message {
 	return &message{pb: pb}
 }
 
-func newMessage() *message {
+func New() *message {
 	return new(message)
 }
 
diff --git a/bitswap/message.pb.go b/bitswap/message/message.pb.go
similarity index 98%
rename from bitswap/message.pb.go
rename to bitswap/message/message.pb.go
index a340ca073..d1089f5c9 100644
--- a/bitswap/message.pb.go
+++ b/bitswap/message/message.pb.go
@@ -11,7 +11,7 @@ It is generated from these files:
 It has these top-level messages:
 	PBMessage
 */
-package bitswap
+package message
 
 import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 import math "math"
diff --git a/bitswap/message.proto b/bitswap/message/message.proto
similarity index 82%
rename from bitswap/message.proto
rename to bitswap/message/message.proto
index b025ac3c3..a0e4d1997 100644
--- a/bitswap/message.proto
+++ b/bitswap/message/message.proto
@@ -1,4 +1,4 @@
-package bitswap;
+package message;
 
 message PBMessage {
 	repeated string wantlist = 1;
diff --git a/bitswap/message_test.go b/bitswap/message/message_test.go
similarity index 94%
rename from bitswap/message_test.go
rename to bitswap/message/message_test.go
index bc52b5aa9..87a36cea1 100644
--- a/bitswap/message_test.go
+++ b/bitswap/message/message_test.go
@@ -1,4 +1,4 @@
-package bitswap
+package message
 
 import (
 	"bytes"
@@ -10,7 +10,7 @@ import (
 
 func TestAppendWanted(t *testing.T) {
 	const str = "foo"
-	m := newMessage()
+	m := New()
 	m.AppendWanted(u.Key(str))
 
 	if !contains(m.ToProto().GetWantlist(), str) {
@@ -37,7 +37,7 @@ func TestAppendBlock(t *testing.T) {
 	strs = append(strs, "Celeritas")
 	strs = append(strs, "Incendia")
 
-	m := newMessage()
+	m := New()
 	for _, str := range strs {
 		block, err := blocks.NewBlock([]byte(str))
 		if err != nil {
@@ -57,7 +57,7 @@ func TestAppendBlock(t *testing.T) {
 
 func TestCopyProtoByValue(t *testing.T) {
 	const str = "foo"
-	m := newMessage()
+	m := New()
 	protoBeforeAppend := m.ToProto()
 	m.AppendWanted(u.Key(str))
 	if contains(protoBeforeAppend.GetWantlist(), str) {