diff --git a/types/block.go b/pkg/block/block.go
similarity index 99%
rename from types/block.go
rename to pkg/block/block.go
index 2f444be74..74fd18287 100644
--- a/types/block.go
+++ b/pkg/block/block.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/block_meta.go b/pkg/block/block_meta.go
similarity index 99%
rename from types/block_meta.go
rename to pkg/block/block_meta.go
index 1ce262d9a..31ed5e2fa 100644
--- a/types/block_meta.go
+++ b/pkg/block/block_meta.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/block_meta_test.go b/pkg/block/block_meta_test.go
similarity index 99%
rename from types/block_meta_test.go
rename to pkg/block/block_meta_test.go
index a1a382ffa..921e96164 100644
--- a/types/block_meta_test.go
+++ b/pkg/block/block_meta_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"testing"
diff --git a/types/block_test.go b/pkg/block/block_test.go
similarity index 99%
rename from types/block_test.go
rename to pkg/block/block_test.go
index 1c762653b..49b920ce9 100644
--- a/types/block_test.go
+++ b/pkg/block/block_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	// it is ok to use math/rand here: we do not need a cryptographically secure random
diff --git a/types/canonical.go b/pkg/block/canonical.go
similarity index 99%
rename from types/canonical.go
rename to pkg/block/canonical.go
index 01c3d851d..4002580f0 100644
--- a/types/canonical.go
+++ b/pkg/block/canonical.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"time"
diff --git a/types/canonical_test.go b/pkg/block/canonical_test.go
similarity index 98%
rename from types/canonical_test.go
rename to pkg/block/canonical_test.go
index 53a8ea52f..bb5324118 100644
--- a/types/canonical_test.go
+++ b/pkg/block/canonical_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"reflect"
diff --git a/types/encoding_helper.go b/pkg/block/encoding_helper.go
similarity index 98%
rename from types/encoding_helper.go
rename to pkg/block/encoding_helper.go
index 630b088ce..483614ff4 100644
--- a/types/encoding_helper.go
+++ b/pkg/block/encoding_helper.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	gogotypes "github.com/gogo/protobuf/types"
diff --git a/types/errors.go b/pkg/block/errors.go
similarity index 98%
rename from types/errors.go
rename to pkg/block/errors.go
index d828f6387..c46c1082f 100644
--- a/types/errors.go
+++ b/pkg/block/errors.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import "fmt"
 
diff --git a/types/event_bus.go b/pkg/block/event_bus.go
similarity index 99%
rename from types/event_bus.go
rename to pkg/block/event_bus.go
index dfe3a0664..f9867aa9e 100644
--- a/types/event_bus.go
+++ b/pkg/block/event_bus.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
diff --git a/types/event_bus_test.go b/pkg/block/event_bus_test.go
similarity index 99%
rename from types/event_bus_test.go
rename to pkg/block/event_bus_test.go
index 9ca075391..58d7e7dc3 100644
--- a/types/event_bus_test.go
+++ b/pkg/block/event_bus_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
diff --git a/types/events.go b/pkg/block/events.go
similarity index 99%
rename from types/events.go
rename to pkg/block/events.go
index 46f150abd..f6dbb799c 100644
--- a/types/events.go
+++ b/pkg/block/events.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"fmt"
diff --git a/types/events_test.go b/pkg/block/events_test.go
similarity index 97%
rename from types/events_test.go
rename to pkg/block/events_test.go
index dcd998ace..fb1e26232 100644
--- a/types/events_test.go
+++ b/pkg/block/events_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"fmt"
diff --git a/types/evidence.go b/pkg/block/evidence.go
similarity index 99%
rename from types/evidence.go
rename to pkg/block/evidence.go
index 40ff85e5e..bcfa56263 100644
--- a/types/evidence.go
+++ b/pkg/block/evidence.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/evidence_test.go b/pkg/block/evidence_test.go
similarity index 99%
rename from types/evidence_test.go
rename to pkg/block/evidence_test.go
index 9d54797e4..5d0aa7cb8 100644
--- a/types/evidence_test.go
+++ b/pkg/block/evidence_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
diff --git a/types/genesis.go b/pkg/block/genesis.go
similarity index 99%
rename from types/genesis.go
rename to pkg/block/genesis.go
index 47580d5f7..7ffe3808e 100644
--- a/types/genesis.go
+++ b/pkg/block/genesis.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/genesis_test.go b/pkg/block/genesis_test.go
similarity index 99%
rename from types/genesis_test.go
rename to pkg/block/genesis_test.go
index 7fb3088dd..63902741f 100644
--- a/types/genesis_test.go
+++ b/pkg/block/genesis_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"io/ioutil"
diff --git a/types/light.go b/pkg/block/light.go
similarity index 99%
rename from types/light.go
rename to pkg/block/light.go
index 5a650a159..139b63a2a 100644
--- a/types/light.go
+++ b/pkg/block/light.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/light_test.go b/pkg/block/light_test.go
similarity index 99%
rename from types/light_test.go
rename to pkg/block/light_test.go
index 94b2c4b4f..61b85e035 100644
--- a/types/light_test.go
+++ b/pkg/block/light_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"math"
diff --git a/types/params.go b/pkg/block/params.go
similarity index 99%
rename from types/params.go
rename to pkg/block/params.go
index 32d0f71c8..6eb1b101c 100644
--- a/types/params.go
+++ b/pkg/block/params.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"errors"
diff --git a/types/params_test.go b/pkg/block/params_test.go
similarity index 99%
rename from types/params_test.go
rename to pkg/block/params_test.go
index 8b69a81fc..6ab272b6c 100644
--- a/types/params_test.go
+++ b/pkg/block/params_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/part_set.go b/pkg/block/part_set.go
similarity index 99%
rename from types/part_set.go
rename to pkg/block/part_set.go
index 3a691083f..0c4b08382 100644
--- a/types/part_set.go
+++ b/pkg/block/part_set.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/part_set_test.go b/pkg/block/part_set_test.go
similarity index 99%
rename from types/part_set_test.go
rename to pkg/block/part_set_test.go
index c6ea0f452..8357c5e28 100644
--- a/types/part_set_test.go
+++ b/pkg/block/part_set_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"io/ioutil"
diff --git a/types/priv_validator.go b/pkg/block/priv_validator.go
similarity index 99%
rename from types/priv_validator.go
rename to pkg/block/priv_validator.go
index aa2c303db..f90319952 100644
--- a/types/priv_validator.go
+++ b/pkg/block/priv_validator.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/proposal.go b/pkg/block/proposal.go
similarity index 99%
rename from types/proposal.go
rename to pkg/block/proposal.go
index 450cc2a43..deee8390d 100644
--- a/types/proposal.go
+++ b/pkg/block/proposal.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"errors"
diff --git a/types/proposal_test.go b/pkg/block/proposal_test.go
similarity index 99%
rename from types/proposal_test.go
rename to pkg/block/proposal_test.go
index 47f5a8890..6bb7e5e69 100644
--- a/types/proposal_test.go
+++ b/pkg/block/proposal_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
diff --git a/types/protobuf.go b/pkg/block/protobuf.go
similarity index 99%
rename from types/protobuf.go
rename to pkg/block/protobuf.go
index 7cd224665..76baa2b97 100644
--- a/types/protobuf.go
+++ b/pkg/block/protobuf.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
diff --git a/types/protobuf_test.go b/pkg/block/protobuf_test.go
similarity index 99%
rename from types/protobuf_test.go
rename to pkg/block/protobuf_test.go
index b6900f40c..08d2e9afe 100644
--- a/types/protobuf_test.go
+++ b/pkg/block/protobuf_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"testing"
diff --git a/types/signable.go b/pkg/block/signable.go
similarity index 98%
rename from types/signable.go
rename to pkg/block/signable.go
index 25e307316..ad54eb1b6 100644
--- a/types/signable.go
+++ b/pkg/block/signable.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
diff --git a/types/signed_msg_type.go b/pkg/block/signed_msg_type.go
similarity index 95%
rename from types/signed_msg_type.go
rename to pkg/block/signed_msg_type.go
index 4ab5685a7..9360cf7b0 100644
--- a/types/signed_msg_type.go
+++ b/pkg/block/signed_msg_type.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
diff --git a/types/test_util.go b/pkg/block/test_util.go
similarity index 98%
rename from types/test_util.go
rename to pkg/block/test_util.go
index f5ec1a976..f2f6dc181 100644
--- a/types/test_util.go
+++ b/pkg/block/test_util.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
diff --git a/types/tx.go b/pkg/block/tx.go
similarity index 99%
rename from types/tx.go
rename to pkg/block/tx.go
index 92df92f13..a9a55c579 100644
--- a/types/tx.go
+++ b/pkg/block/tx.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/tx_test.go b/pkg/block/tx_test.go
similarity index 99%
rename from types/tx_test.go
rename to pkg/block/tx_test.go
index 8fe277da8..8e51f8549 100644
--- a/types/tx_test.go
+++ b/pkg/block/tx_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/utils.go b/pkg/block/utils.go
similarity index 98%
rename from types/utils.go
rename to pkg/block/utils.go
index cec47e202..9a2720a12 100644
--- a/types/utils.go
+++ b/pkg/block/utils.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import "reflect"
 
diff --git a/types/validation.go b/pkg/block/validation.go
similarity index 99%
rename from types/validation.go
rename to pkg/block/validation.go
index 1bf0265db..1950ff278 100644
--- a/types/validation.go
+++ b/pkg/block/validation.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"errors"
diff --git a/types/validation_test.go b/pkg/block/validation_test.go
similarity index 99%
rename from types/validation_test.go
rename to pkg/block/validation_test.go
index 4fc7b70ff..8fe94daf5 100644
--- a/types/validation_test.go
+++ b/pkg/block/validation_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
diff --git a/types/validator.go b/pkg/block/validator.go
similarity index 99%
rename from types/validator.go
rename to pkg/block/validator.go
index fb3fa2d76..6a5539a9c 100644
--- a/types/validator.go
+++ b/pkg/block/validator.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/validator_set.go b/pkg/block/validator_set.go
similarity index 99%
rename from types/validator_set.go
rename to pkg/block/validator_set.go
index 8675dec2a..c36cf6de5 100644
--- a/types/validator_set.go
+++ b/pkg/block/validator_set.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/validator_set_test.go b/pkg/block/validator_set_test.go
similarity index 99%
rename from types/validator_set_test.go
rename to pkg/block/validator_set_test.go
index a69121344..bb0ed93d2 100644
--- a/types/validator_set_test.go
+++ b/pkg/block/validator_set_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/validator_test.go b/pkg/block/validator_test.go
similarity index 99%
rename from types/validator_test.go
rename to pkg/block/validator_test.go
index 872dee820..a4bdcab0a 100644
--- a/types/validator_test.go
+++ b/pkg/block/validator_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/tendermint/tendermint/crypto"
 )
 
diff --git a/types/vote.go b/pkg/block/vote.go
similarity index 99%
rename from types/vote.go
rename to pkg/block/vote.go
index e8105ad70..165018109 100644
--- a/types/vote.go
+++ b/pkg/block/vote.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/vote_set.go b/pkg/block/vote_set.go
similarity index 99%
rename from types/vote_set.go
rename to pkg/block/vote_set.go
index b064f2c07..5f8216334 100644
--- a/types/vote_set.go
+++ b/pkg/block/vote_set.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/vote_set_test.go b/pkg/block/vote_set_test.go
similarity index 99%
rename from types/vote_set_test.go
rename to pkg/block/vote_set_test.go
index 542665e2d..8f32aea55 100644
--- a/types/vote_set_test.go
+++ b/pkg/block/vote_set_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"bytes"
diff --git a/types/vote_test.go b/pkg/block/vote_test.go
similarity index 99%
rename from types/vote_test.go
rename to pkg/block/vote_test.go
index bfd1c4164..1161843ef 100644
--- a/types/vote_test.go
+++ b/pkg/block/vote_test.go
@@ -1,4 +1,4 @@
-package types
+package block
 
 import (
 	"context"