diff --git a/autofile/autofile.go b/autofile/autofile.go
index e61bbb832..83395a536 100644
--- a/autofile/autofile.go
+++ b/autofile/autofile.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 /* AutoFile usage
diff --git a/autofile/autofile_test.go b/autofile/autofile_test.go
index 243125ca6..c8b81ed39 100644
--- a/autofile/autofile_test.go
+++ b/autofile/autofile_test.go
@@ -1,7 +1,7 @@
 package autofile
 
 import (
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 	"os"
 	"sync/atomic"
 	"syscall"
diff --git a/autofile/group.go b/autofile/group.go
index ee1a94158..faeba6e74 100644
--- a/autofile/group.go
+++ b/autofile/group.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 /*
diff --git a/autofile/group_test.go b/autofile/group_test.go
index 1c2280e83..aa4c794fa 100644
--- a/autofile/group_test.go
+++ b/autofile/group_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 // NOTE: Returned group has ticker stopped
diff --git a/db/c_level_db.go b/db/c_level_db.go
index 33a780094..8de2732ea 100644
--- a/db/c_level_db.go
+++ b/db/c_level_db.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/jmhodges/levigo"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 func init() {
diff --git a/db/c_level_db_test.go b/db/c_level_db_test.go
index b90161498..1ce2202c8 100644
--- a/db/c_level_db_test.go
+++ b/db/c_level_db_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 func BenchmarkRandomReadsWrites2(b *testing.B) {
diff --git a/db/db.go b/db/db.go
index b88499092..682ecfc4c 100644
--- a/db/db.go
+++ b/db/db.go
@@ -1,6 +1,6 @@
 package db
 
-import . "github.com/tendermint/go-common"
+import . "github.com/tendermint/go-common/common"
 
 type DB interface {
 	Get([]byte) []byte
diff --git a/db/go_level_db.go b/db/go_level_db.go
index 1b4a937cf..9b6e25a1e 100644
--- a/db/go_level_db.go
+++ b/db/go_level_db.go
@@ -8,7 +8,7 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 func init() {
diff --git a/db/go_level_db_test.go b/db/go_level_db_test.go
index 24b64734d..eb0631665 100644
--- a/db/go_level_db_test.go
+++ b/db/go_level_db_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 func BenchmarkRandomReadsWrites(b *testing.B) {
diff --git a/events/events.go b/events/events.go
index e613a8e04..208cea26e 100644
--- a/events/events.go
+++ b/events/events.go
@@ -6,7 +6,7 @@ package events
 import (
 	"sync"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 // Generic event data can be typed and registered with tendermint/go-wire
diff --git a/events/log.go b/events/log.go
index 525462294..f79b657bd 100644
--- a/events/log.go
+++ b/events/log.go
@@ -1,7 +1,7 @@
 package events
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/go-common/logger"
 )
 
 var log = logger.New("module", "events")
diff --git a/logger/log.go b/logger/log.go
index 07c1e6a49..edc2ddcf5 100644
--- a/logger/log.go
+++ b/logger/log.go
@@ -3,7 +3,7 @@ package logger
 import (
 	"os"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 	"github.com/tendermint/log15"
 )
 
diff --git a/process/util.go b/process/util.go
index 4976e46e5..5e954473a 100644
--- a/process/util.go
+++ b/process/util.go
@@ -1,7 +1,7 @@
 package process
 
 import (
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 // Runs a command and gets the result.
diff --git a/test/mutate.go b/test/mutate.go
index 629e9f865..3b552ff3c 100644
--- a/test/mutate.go
+++ b/test/mutate.go
@@ -1,7 +1,7 @@
 package test
 
 import (
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/go-common/common"
 )
 
 // Contract: !bytes.Equal(input, output) && len(input) >= len(output)