diff --git a/lib/stdi2p/certificate.go b/lib/common/certificate.go
similarity index 99%
rename from lib/stdi2p/certificate.go
rename to lib/common/certificate.go
index 5fd2093..5c3f3f4 100644
--- a/lib/stdi2p/certificate.go
+++ b/lib/common/certificate.go
@@ -1,4 +1,4 @@
-package stdi2p
+package common
 
 import (
 	"encoding/binary"
diff --git a/lib/common/data.go b/lib/common/data.go
index 9d54432..006f938 100644
--- a/lib/common/data.go
+++ b/lib/common/data.go
@@ -2,3 +2,9 @@ package common
 
 // the sha256 of some datastructure
 type IdentHash [32]byte
+
+// i2p date time stamp
+type Date [8]byte
+
+// i2p bytestring
+type String []byte
diff --git a/lib/stdi2p/destination.go b/lib/common/destination.go
similarity index 98%
rename from lib/stdi2p/destination.go
rename to lib/common/destination.go
index a0cb989..4b1b795 100644
--- a/lib/stdi2p/destination.go
+++ b/lib/common/destination.go
@@ -1,4 +1,4 @@
-package stdi2p
+package common
 
 import (
 	"github.com/bounce-chat/go-i2p/lib/common/base32"
diff --git a/lib/netdb/entry.go b/lib/netdb/entry.go
index 272251b..5f3e250 100644
--- a/lib/netdb/entry.go
+++ b/lib/netdb/entry.go
@@ -16,3 +16,7 @@ func (e *Entry) FilePath(n StdNetDB) (str string) {
 func (e *Entry) WriteTo(w io.Writer) (err error) {
 	return
 }
+
+func (e *Entry) ReadFrom(r io.Reader) (err error) {
+	return
+}
diff --git a/lib/stdi2p/RouterIdentity.go b/lib/stdi2p/RouterIdentity.go
deleted file mode 100644
index fabbe08..0000000
--- a/lib/stdi2p/RouterIdentity.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package stdi2p
-
-// Router Identity
-type RouterIdentity struct {
-}
diff --git a/lib/stdi2p/RouterInfo.go b/lib/stdi2p/RouterInfo.go
deleted file mode 100644
index 7110daf..0000000
--- a/lib/stdi2p/RouterInfo.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package stdi2p
-
-type RouterInfo struct {
-}
diff --git a/lib/stdi2p/common.go b/lib/stdi2p/common.go
deleted file mode 100644
index 6310401..0000000
--- a/lib/stdi2p/common.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package stdi2p
-
-// i2p date time stamp
-type Date [8]byte
-
-// i2p bytestring
-type String []byte
diff --git a/lib/stdi2p/signing.go b/lib/stdi2p/signing.go
deleted file mode 100644
index 00ea383..0000000
--- a/lib/stdi2p/signing.go
+++ /dev/null
@@ -1 +0,0 @@
-package stdi2p
diff --git a/lib/stdi2p/su3.go b/lib/stdi2p/su3.go
deleted file mode 100644
index 9fe90f5..0000000
--- a/lib/stdi2p/su3.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package stdi2p
-
-// an su3 archive
-type SU3 struct {
-}