diff --git a/Cargo.lock b/Cargo.lock
index 3d7588b5b7..ffb75a6697 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1394,9 +1394,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-consensus"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "758e2a0cd8a6cdf483e1d369e7d081647e00b88d8953e34d8f2cbba05ae28368"
+checksum = "542217a53411d471743362251a5a1770a667cb0cc0384c9be2c0952bd70a7275"
 dependencies = [
  "curve25519-dalek-ng",
  "hex",
@@ -2937,6 +2937,7 @@ dependencies = [
  "itertools",
  "libsecp256k1",
  "loupe",
+ "namada_core",
  "namada_proof_of_stake",
  "parity-wasm",
  "paste",
@@ -3059,6 +3060,35 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "namada_core"
+version = "0.9.0"
+dependencies = [
+ "assert_matches",
+ "bech32",
+ "borsh",
+ "chrono",
+ "data-encoding",
+ "derivative",
+ "ed25519-consensus",
+ "itertools",
+ "libsecp256k1",
+ "pretty_assertions",
+ "proptest",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "rust_decimal",
+ "serde 1.0.145",
+ "serde_json",
+ "sha2 0.9.9",
+ "sparse-merkle-tree",
+ "test-log",
+ "thiserror",
+ "tracing 0.1.37",
+ "tracing-subscriber 0.3.16",
+ "zeroize",
+]
+
 [[package]]
 name = "namada_encoding_spec"
 version = "0.9.0"
@@ -6702,9 +6732,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.5.7"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 5cfa43de02..feacd7bf21 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ resolver = "2"
 
 members = [
   "apps",
+  "core",
   "proof_of_stake",
   "shared",
   "tests",
diff --git a/core/Cargo.toml b/core/Cargo.toml
new file mode 100644
index 0000000000..2b43d37213
--- /dev/null
+++ b/core/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+authors = ["Heliax AG <hello@heliax.dev>"]
+edition = "2021"
+license = "GPL-3.0"
+name = "namada_core"
+resolver = "2"
+version = "0.9.0"
+
+[features]
+default = []
+# for integration tests and test utilies
+testing = [
+  "rand",
+  "rand_core",
+]
+
+[dependencies]
+# We switch off "blake2b" because it cannot be compiled to wasm
+# branch = "bat/arse-merkle-tree"
+arse-merkle-tree = {package = "sparse-merkle-tree", git = "https://github.com/heliaxdev/sparse-merkle-tree", rev = "04ad1eeb28901b57a7599bbe433b3822965dabe8", default-features = false, features = ["std", "borsh"]}
+bech32 = "0.8.0"
+borsh = "0.9.0"
+chrono = {version = "0.4.22", default-features = false, features = ["clock", "std"]}
+data-encoding = "2.3.2"
+derivative = "2.2.0"
+ed25519-consensus = "1.2.0"
+itertools = "0.10.0"
+libsecp256k1 = {git = "https://github.com/heliaxdev/libsecp256k1", rev = "bbb3bd44a49db361f21d9db80f9a087c194c0ae9", default-features = false, features = ["std", "static-context"]}
+rand = {version = "0.8", optional = true}
+rand_core = {version = "0.6", optional = true}
+rust_decimal = "1.26.1"
+serde = {version = "1.0.125", features = ["derive"]}
+serde_json = "1.0.62"
+sha2 = "0.9.3"
+thiserror = "1.0.30"
+tracing = "0.1.30"
+zeroize = {version = "1.5.5", features = ["zeroize_derive"]}
+
+[dev-dependencies]
+assert_matches = "1.5.0"
+libsecp256k1 = {git = "https://github.com/heliaxdev/libsecp256k1", rev = "bbb3bd44a49db361f21d9db80f9a087c194c0ae9"}
+pretty_assertions = "0.7.2"
+# A fork with state machine testing
+proptest = {git = "https://github.com/heliaxdev/proptest", branch = "tomas/sm"}
+rand = {version = "0.8"}
+rand_core = {version = "0.6"}
+test-log = {version = "0.2.7", default-features = false, features = ["trace"]}
+tracing-subscriber = {version = "0.3.7", default-features = false, features = ["env-filter", "fmt"]}
diff --git a/shared/src/bytes.rs b/core/src/bytes.rs
similarity index 100%
rename from shared/src/bytes.rs
rename to core/src/bytes.rs
diff --git a/core/src/ledger/mod.rs b/core/src/ledger/mod.rs
new file mode 100644
index 0000000000..6b3dbf3b3e
--- /dev/null
+++ b/core/src/ledger/mod.rs
@@ -0,0 +1,5 @@
+//! The ledger modules
+
+pub mod storage_api;
+pub mod tx_env;
+pub mod vp_env;
diff --git a/shared/src/ledger/storage_api/collections/lazy_map.rs b/core/src/ledger/storage_api/collections/lazy_map.rs
similarity index 100%
rename from shared/src/ledger/storage_api/collections/lazy_map.rs
rename to core/src/ledger/storage_api/collections/lazy_map.rs
diff --git a/shared/src/ledger/storage_api/collections/lazy_vec.rs b/core/src/ledger/storage_api/collections/lazy_vec.rs
similarity index 100%
rename from shared/src/ledger/storage_api/collections/lazy_vec.rs
rename to core/src/ledger/storage_api/collections/lazy_vec.rs
diff --git a/shared/src/ledger/storage_api/collections/mod.rs b/core/src/ledger/storage_api/collections/mod.rs
similarity index 100%
rename from shared/src/ledger/storage_api/collections/mod.rs
rename to core/src/ledger/storage_api/collections/mod.rs
diff --git a/shared/src/ledger/storage_api/error.rs b/core/src/ledger/storage_api/error.rs
similarity index 100%
rename from shared/src/ledger/storage_api/error.rs
rename to core/src/ledger/storage_api/error.rs
diff --git a/shared/src/ledger/storage_api/mod.rs b/core/src/ledger/storage_api/mod.rs
similarity index 100%
rename from shared/src/ledger/storage_api/mod.rs
rename to core/src/ledger/storage_api/mod.rs
diff --git a/shared/src/ledger/storage_api/validation/mod.rs b/core/src/ledger/storage_api/validation/mod.rs
similarity index 100%
rename from shared/src/ledger/storage_api/validation/mod.rs
rename to core/src/ledger/storage_api/validation/mod.rs
diff --git a/shared/src/ledger/tx_env.rs b/core/src/ledger/tx_env.rs
similarity index 100%
rename from shared/src/ledger/tx_env.rs
rename to core/src/ledger/tx_env.rs
diff --git a/shared/src/ledger/vp_env.rs b/core/src/ledger/vp_env.rs
similarity index 100%
rename from shared/src/ledger/vp_env.rs
rename to core/src/ledger/vp_env.rs
diff --git a/core/src/lib.rs b/core/src/lib.rs
new file mode 100644
index 0000000000..add1f4ba82
--- /dev/null
+++ b/core/src/lib.rs
@@ -0,0 +1,15 @@
+//! TODO
+
+#![doc(html_favicon_url = "https://dev.anoma.net/master/favicon.png")]
+#![doc(html_logo_url = "https://dev.anoma.net/master/rustdoc-logo.png")]
+#![warn(missing_docs)]
+#![deny(rustdoc::broken_intra_doc_links)]
+#![deny(rustdoc::private_intra_doc_links)]
+
+pub mod bytes;
+pub mod ledger;
+pub mod types;
+
+#[cfg(test)]
+#[macro_use]
+extern crate assert_matches;
diff --git a/shared/src/types/address.rs b/core/src/types/address.rs
similarity index 100%
rename from shared/src/types/address.rs
rename to core/src/types/address.rs
diff --git a/shared/src/types/chain.rs b/core/src/types/chain.rs
similarity index 100%
rename from shared/src/types/chain.rs
rename to core/src/types/chain.rs
diff --git a/shared/src/types/governance.rs b/core/src/types/governance.rs
similarity index 100%
rename from shared/src/types/governance.rs
rename to core/src/types/governance.rs
diff --git a/shared/src/types/hash.rs b/core/src/types/hash.rs
similarity index 78%
rename from shared/src/types/hash.rs
rename to core/src/types/hash.rs
index 229cd56063..5bd4518975 100644
--- a/shared/src/types/hash.rs
+++ b/core/src/types/hash.rs
@@ -3,15 +3,15 @@
 use std::fmt::{self, Display};
 use std::ops::Deref;
 
-use arse_merkle_tree::traits::Value;
-use arse_merkle_tree::Hash as TreeHash;
+// use arse_merkle_tree::traits::Value;
+// use arse_merkle_tree::Hash as TreeHash;
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use thiserror::Error;
 
-use crate::tendermint::abci::transaction;
-use crate::tendermint::Hash as TmHash;
+// use crate::tendermint::abci::transaction;
+// use crate::tendermint::Hash as TmHash;
 
 /// The length of the transaction hash string
 pub const HASH_LENGTH: usize = 32;
@@ -86,11 +86,12 @@ impl TryFrom<&[u8]> for Hash {
     }
 }
 
-impl From<Hash> for transaction::Hash {
-    fn from(hash: Hash) -> Self {
-        Self::new(hash.0)
-    }
-}
+// TODO move
+// impl From<Hash> for transaction::Hash {
+//     fn from(hash: Hash) -> Self {
+//         Self::new(hash.0)
+//     }
+// }
 
 impl Hash {
     /// Compute sha256 of some bytes
@@ -99,20 +100,24 @@ impl Hash {
         Self(*digest.as_ref())
     }
 
+    fn zero() -> Self {
+        Self([0u8; 32])
+    }
+
     /// Check if the hash is all zeros
     pub fn is_zero(&self) -> bool {
         self == &Self::zero()
     }
 }
 
-impl From<Hash> for TmHash {
-    fn from(hash: Hash) -> Self {
-        TmHash::Sha256(hash.0)
-    }
-}
-
-impl From<Hash> for TreeHash {
-    fn from(hash: Hash) -> Self {
-        Self::from(hash.0)
-    }
-}
+// impl From<Hash> for TmHash {
+//     fn from(hash: Hash) -> Self {
+//         TmHash::Sha256(hash.0)
+//     }
+// }
+
+// impl From<Hash> for TreeHash {
+//     fn from(hash: Hash) -> Self {
+//         Self::from(hash.0)
+//     }
+// }
diff --git a/shared/src/types/key/common.rs b/core/src/types/key/common.rs
similarity index 97%
rename from shared/src/types/key/common.rs
rename to core/src/types/key/common.rs
index fc4a4732dd..7ec041d638 100644
--- a/shared/src/types/key/common.rs
+++ b/core/src/types/key/common.rs
@@ -5,7 +5,7 @@ use std::str::FromStr;
 
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use data_encoding::HEXLOWER;
-use namada_proof_of_stake::types::PublicKeyTmRawHash;
+// use namada_proof_of_stake::types::PublicKeyTmRawHash;
 #[cfg(feature = "rand")]
 use rand::{CryptoRng, RngCore};
 use serde::{Deserialize, Serialize};
@@ -325,8 +325,9 @@ impl super::SigScheme for SigScheme {
     }
 }
 
-impl PublicKeyTmRawHash for PublicKey {
-    fn tm_raw_hash(&self) -> String {
-        tm_consensus_key_raw_hash(self)
-    }
-}
+// TODO
+// impl PublicKeyTmRawHash for PublicKey {
+//     fn tm_raw_hash(&self) -> String {
+//         tm_consensus_key_raw_hash(self)
+//     }
+// }
diff --git a/shared/src/types/key/ed25519.rs b/core/src/types/key/ed25519.rs
similarity index 100%
rename from shared/src/types/key/ed25519.rs
rename to core/src/types/key/ed25519.rs
diff --git a/shared/src/types/key/mod.rs b/core/src/types/key/mod.rs
similarity index 99%
rename from shared/src/types/key/mod.rs
rename to core/src/types/key/mod.rs
index 78efcc5375..17f6fd34ba 100644
--- a/shared/src/types/key/mod.rs
+++ b/core/src/types/key/mod.rs
@@ -1,6 +1,4 @@
 //! Cryptographic keys
-/// Elliptic curve keys for the DKG
-pub mod dkg_session_keys;
 
 use std::fmt::{Debug, Display};
 use std::hash::Hash;
diff --git a/shared/src/types/key/secp256k1.rs b/core/src/types/key/secp256k1.rs
similarity index 100%
rename from shared/src/types/key/secp256k1.rs
rename to core/src/types/key/secp256k1.rs
diff --git a/core/src/types/mod.rs b/core/src/types/mod.rs
new file mode 100644
index 0000000000..db32b3d140
--- /dev/null
+++ b/core/src/types/mod.rs
@@ -0,0 +1,11 @@
+//! Types definitions.
+
+pub mod address;
+pub mod chain;
+pub mod governance;
+pub mod hash;
+pub mod key;
+pub mod storage;
+pub mod time;
+pub mod token;
+pub mod validity_predicate;
diff --git a/shared/src/types/named_address.rs b/core/src/types/named_address.rs
similarity index 100%
rename from shared/src/types/named_address.rs
rename to core/src/types/named_address.rs
diff --git a/shared/src/types/storage.rs b/core/src/types/storage.rs
similarity index 94%
rename from shared/src/types/storage.rs
rename to core/src/types/storage.rs
index 57d0f66c5d..628872715f 100644
--- a/shared/src/types/storage.rs
+++ b/core/src/types/storage.rs
@@ -6,17 +6,17 @@ use std::num::ParseIntError;
 use std::ops::{Add, Deref, Div, Mul, Rem, Sub};
 use std::str::FromStr;
 
-use arse_merkle_tree::InternalKey;
+// use arse_merkle_tree::InternalKey;
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use data_encoding::BASE32HEX_NOPAD;
-use ics23::CommitmentProof;
+// use ics23::CommitmentProof;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 #[cfg(feature = "ferveo-tpke")]
 use super::transaction::WrapperTx;
 use crate::bytes::ByteBuf;
-use crate::ledger::storage::IBC_KEY_LIMIT;
+// use crate::ledger::storage::IBC_KEY_LIMIT;
 use crate::types::address::{self, Address};
 use crate::types::hash::Hash;
 use crate::types::time::DateTimeUtc;
@@ -267,55 +267,55 @@ where
     }
 }
 
-/// Storage keys that are utf8 encoded strings
-#[derive(Eq, PartialEq, Copy, Clone, Hash)]
-pub struct StringKey {
-    /// The original key string, in bytes
-    pub original: [u8; IBC_KEY_LIMIT],
-    /// The utf8 bytes representation of the key to be
-    /// used internally in the merkle tree
-    pub tree_key: InternalKey<IBC_KEY_LIMIT>,
-    /// The length of the input (without the padding)
-    pub length: usize,
-}
-
-impl Deref for StringKey {
-    type Target = InternalKey<IBC_KEY_LIMIT>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.tree_key
-    }
-}
-
-impl BorshSerialize for StringKey {
-    fn serialize<W: Write>(&self, writer: &mut W) -> std::io::Result<()> {
-        let to_serialize = (self.original.to_vec(), self.tree_key, self.length);
-        BorshSerialize::serialize(&to_serialize, writer)
-    }
-}
-
-impl BorshDeserialize for StringKey {
-    fn deserialize(buf: &mut &[u8]) -> std::io::Result<Self> {
-        use std::io::ErrorKind;
-        let (original, tree_key, length): (
-            Vec<u8>,
-            InternalKey<IBC_KEY_LIMIT>,
-            usize,
-        ) = BorshDeserialize::deserialize(buf)?;
-        let original: [u8; IBC_KEY_LIMIT] =
-            original.try_into().map_err(|_| {
-                std::io::Error::new(
-                    ErrorKind::InvalidData,
-                    "Input byte vector is too large",
-                )
-            })?;
-        Ok(Self {
-            original,
-            tree_key,
-            length,
-        })
-    }
-}
+// /// Storage keys that are utf8 encoded strings
+// #[derive(Eq, PartialEq, Copy, Clone, Hash)]
+// pub struct StringKey {
+//     /// The original key string, in bytes
+//     pub original: [u8; IBC_KEY_LIMIT],
+//     /// The utf8 bytes representation of the key to be
+//     /// used internally in the merkle tree
+//     pub tree_key: InternalKey<IBC_KEY_LIMIT>,
+//     /// The length of the input (without the padding)
+//     pub length: usize,
+// }
+
+// impl Deref for StringKey {
+//     type Target = InternalKey<IBC_KEY_LIMIT>;
+
+//     fn deref(&self) -> &Self::Target {
+//         &self.tree_key
+//     }
+// }
+
+// impl BorshSerialize for StringKey {
+//     fn serialize<W: Write>(&self, writer: &mut W) -> std::io::Result<()> {
+//         let to_serialize = (self.original.to_vec(), self.tree_key,
+// self.length);         BorshSerialize::serialize(&to_serialize, writer)
+//     }
+// }
+
+// impl BorshDeserialize for StringKey {
+//     fn deserialize(buf: &mut &[u8]) -> std::io::Result<Self> {
+//         use std::io::ErrorKind;
+//         let (original, tree_key, length): (
+//             Vec<u8>,
+//             InternalKey<IBC_KEY_LIMIT>,
+//             usize,
+//         ) = BorshDeserialize::deserialize(buf)?;
+//         let original: [u8; IBC_KEY_LIMIT] =
+//             original.try_into().map_err(|_| {
+//                 std::io::Error::new(
+//                     ErrorKind::InvalidData,
+//                     "Input byte vector is too large",
+//                 )
+//             })?;
+//         Ok(Self {
+//             original,
+//             tree_key,
+//             length,
+//         })
+//     }
+// }
 
 /// A wrapper around raw bytes to be stored as values
 /// in a merkle tree
@@ -346,17 +346,18 @@ impl From<TreeBytes> for Vec<u8> {
     }
 }
 
-/// Type of membership proof from a merkle tree
-pub enum MembershipProof {
-    /// ICS23 compliant membership proof
-    ICS23(CommitmentProof),
-}
-
-impl From<CommitmentProof> for MembershipProof {
-    fn from(proof: CommitmentProof) -> Self {
-        Self::ICS23(proof)
-    }
-}
+// TODO not sure
+// /// Type of membership proof from a merkle tree
+// pub enum MembershipProof {
+//     /// ICS23 compliant membership proof
+//     ICS23(CommitmentProof),
+// }
+
+// impl From<CommitmentProof> for MembershipProof {
+//     fn from(proof: CommitmentProof) -> Self {
+//         Self::ICS23(proof)
+//     }
+// }
 
 impl Key {
     /// Parses string and returns a key
diff --git a/shared/src/types/time.rs b/core/src/types/time.rs
similarity index 77%
rename from shared/src/types/time.rs
rename to core/src/types/time.rs
index dfca614c82..13de2685ad 100644
--- a/shared/src/types/time.rs
+++ b/core/src/types/time.rs
@@ -7,10 +7,6 @@ use std::ops::{Add, Sub};
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 pub use chrono::{DateTime, Duration, TimeZone, Utc};
 
-use crate::tendermint::time::Time;
-use crate::tendermint::Error as TendermintError;
-use crate::tendermint_proto::google::protobuf;
-
 /// Check if the given `duration` has passed since the given `start.
 pub fn duration_passed(
     current: DateTimeUtc,
@@ -179,35 +175,37 @@ impl From<DateTime<Utc>> for DateTimeUtc {
     }
 }
 
-impl TryFrom<prost_types::Timestamp> for DateTimeUtc {
-    type Error = prost_types::TimestampOutOfSystemRangeError;
+// TODO move
+// impl TryFrom<prost_types::Timestamp> for DateTimeUtc {
+//     type Error = prost_types::TimestampOutOfSystemRangeError;
 
-    fn try_from(
-        timestamp: prost_types::Timestamp,
-    ) -> Result<Self, Self::Error> {
-        let system_time: std::time::SystemTime = timestamp.try_into()?;
-        Ok(Self(system_time.into()))
-    }
-}
+//     fn try_from(
+//         timestamp: prost_types::Timestamp,
+//     ) -> Result<Self, Self::Error> {
+//         let system_time: std::time::SystemTime = timestamp.try_into()?;
+//         Ok(Self(system_time.into()))
+//     }
+// }
 
-impl From<DateTimeUtc> for prost_types::Timestamp {
-    fn from(dt: DateTimeUtc) -> Self {
-        let seconds = dt.0.timestamp();
-        let nanos = dt.0.timestamp_subsec_nanos() as i32;
-        prost_types::Timestamp { seconds, nanos }
-    }
-}
+// impl From<DateTimeUtc> for prost_types::Timestamp {
+//     fn from(dt: DateTimeUtc) -> Self {
+//         let seconds = dt.0.timestamp();
+//         let nanos = dt.0.timestamp_subsec_nanos() as i32;
+//         prost_types::Timestamp { seconds, nanos }
+//     }
+// }
 
-impl TryFrom<protobuf::Timestamp> for DateTimeUtc {
-    type Error = prost_types::TimestampOutOfSystemRangeError;
+// TODO move
+// impl TryFrom<protobuf::Timestamp> for DateTimeUtc {
+//     type Error = prost_types::TimestampOutOfSystemRangeError;
 
-    fn try_from(timestamp: protobuf::Timestamp) -> Result<Self, Self::Error> {
-        Self::try_from(prost_types::Timestamp {
-            seconds: timestamp.seconds,
-            nanos: timestamp.nanos,
-        })
-    }
-}
+//     fn try_from(timestamp: protobuf::Timestamp) -> Result<Self, Self::Error>
+// {         Self::try_from(prost_types::Timestamp {
+//             seconds: timestamp.seconds,
+//             nanos: timestamp.nanos,
+//         })
+//     }
+// }
 
 impl From<DateTimeUtc> for std::time::SystemTime {
     fn from(dt: DateTimeUtc) -> Self {
@@ -230,18 +228,19 @@ impl From<DateTimeUtc> for Rfc3339String {
     }
 }
 
-impl TryFrom<DateTimeUtc> for Time {
-    type Error = TendermintError;
+// TODO move
+// impl TryFrom<DateTimeUtc> for Time {
+//     type Error = TendermintError;
 
-    fn try_from(dt: DateTimeUtc) -> Result<Self, Self::Error> {
-        Self::parse_from_rfc3339(&DateTime::to_rfc3339(&dt.0))
-    }
-}
+//     fn try_from(dt: DateTimeUtc) -> Result<Self, Self::Error> {
+//         Self::parse_from_rfc3339(&DateTime::to_rfc3339(&dt.0))
+//     }
+// }
 
-impl TryFrom<Time> for DateTimeUtc {
-    type Error = chrono::ParseError;
+// impl TryFrom<Time> for DateTimeUtc {
+//     type Error = chrono::ParseError;
 
-    fn try_from(t: Time) -> Result<Self, Self::Error> {
-        Rfc3339String(t.to_rfc3339()).try_into()
-    }
-}
+//     fn try_from(t: Time) -> Result<Self, Self::Error> {
+//         Rfc3339String(t.to_rfc3339()).try_into()
+//     }
+// }
diff --git a/shared/src/types/token.rs b/core/src/types/token.rs
similarity index 92%
rename from shared/src/types/token.rs
rename to core/src/types/token.rs
index b19642b85a..4b1c8d2f2a 100644
--- a/shared/src/types/token.rs
+++ b/core/src/types/token.rs
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use crate::types::address::{Address, Error as AddressError, InternalAddress};
-use crate::types::ibc::data::FungibleTokenPacketData;
+// use crate::types::ibc::data::FungibleTokenPacketData;
 use crate::types::storage::{DbKeySeg, Key, KeySeg};
 
 /// Amount in micro units. For different granularity another representation
@@ -398,32 +398,32 @@ pub enum TransferError {
     NoToken,
 }
 
-impl TryFrom<FungibleTokenPacketData> for Transfer {
-    type Error = TransferError;
-
-    fn try_from(data: FungibleTokenPacketData) -> Result<Self, Self::Error> {
-        let source =
-            Address::decode(&data.sender).map_err(TransferError::Address)?;
-        let target =
-            Address::decode(&data.receiver).map_err(TransferError::Address)?;
-        let token_str = data
-            .denomination
-            .split('/')
-            .last()
-            .ok_or(TransferError::NoToken)?;
-        let token =
-            Address::decode(token_str).map_err(TransferError::Address)?;
-        let amount =
-            Amount::from_str(&data.amount).map_err(TransferError::Amount)?;
-        Ok(Self {
-            source,
-            target,
-            token,
-            sub_prefix: None,
-            amount,
-        })
-    }
-}
+// impl TryFrom<FungibleTokenPacketData> for Transfer {
+//     type Error = TransferError;
+
+//     fn try_from(data: FungibleTokenPacketData) -> Result<Self, Self::Error> {
+//         let source =
+//             Address::decode(&data.sender).map_err(TransferError::Address)?;
+//         let target =
+//             Address::decode(&data.receiver).map_err(TransferError::Address)?;
+//         let token_str = data
+//             .denomination
+//             .split('/')
+//             .last()
+//             .ok_or(TransferError::NoToken)?;
+//         let token =
+//             Address::decode(token_str).map_err(TransferError::Address)?;
+//         let amount =
+//             Amount::from_str(&data.amount).map_err(TransferError::Amount)?;
+//         Ok(Self {
+//             source,
+//             target,
+//             token,
+//             sub_prefix: None,
+//             amount,
+//         })
+//     }
+// }
 
 #[cfg(test)]
 mod tests {
diff --git a/shared/src/types/validity_predicate.rs b/core/src/types/validity_predicate.rs
similarity index 100%
rename from shared/src/types/validity_predicate.rs
rename to core/src/types/validity_predicate.rs
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 87bae5ef94..1d7252f892 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -76,6 +76,7 @@ abciplus = [
 ]
 
 [dependencies]
+namada_core = {path = "../core"}
 namada_proof_of_stake = {path = "../proof_of_stake"}
 ark-bls12-381 = {version = "0.3"}
 ark-ec = {version = "0.3", optional = true}
diff --git a/shared/src/ledger/mod.rs b/shared/src/ledger/mod.rs
index cbe2528b76..edee7539c9 100644
--- a/shared/src/ledger/mod.rs
+++ b/shared/src/ledger/mod.rs
@@ -13,5 +13,4 @@ pub mod queries;
 pub mod slash_fund;
 pub mod storage;
 pub mod storage_api;
-pub mod tx_env;
-pub mod vp_env;
+pub use namada_core::ledger::{tx_env, vp_env};
diff --git a/shared/src/ledger/pos/mod.rs b/shared/src/ledger/pos/mod.rs
index 563990a24a..d0d27af9de 100644
--- a/shared/src/ledger/pos/mod.rs
+++ b/shared/src/ledger/pos/mod.rs
@@ -75,53 +75,54 @@ pub type GenesisValidator = namada_proof_of_stake::types::GenesisValidator<
     key::common::PublicKey,
 >;
 
-impl From<Epoch> for namada_proof_of_stake::types::Epoch {
-    fn from(epoch: Epoch) -> Self {
-        let epoch: u64 = epoch.into();
-        namada_proof_of_stake::types::Epoch::from(epoch)
-    }
-}
-
-impl From<namada_proof_of_stake::types::Epoch> for Epoch {
-    fn from(epoch: namada_proof_of_stake::types::Epoch) -> Self {
-        let epoch: u64 = epoch.into();
-        Epoch(epoch)
-    }
-}
+// TODO pos will depend on core, so it will be able to `Epoch` type directly
+// impl From<Epoch> for namada_proof_of_stake::types::Epoch {
+//     fn from(epoch: Epoch) -> Self {
+//         let epoch: u64 = epoch.into();
+//         namada_proof_of_stake::types::Epoch::from(epoch)
+//     }
+// }
+
+// impl From<namada_proof_of_stake::types::Epoch> for Epoch {
+//     fn from(epoch: namada_proof_of_stake::types::Epoch) -> Self {
+//         let epoch: u64 = epoch.into();
+//         Epoch(epoch)
+//     }
+// }
 
 // The error conversions are needed to implement `PosActions` in
 // `tx_prelude/src/proof_of_stake.rs`
-impl From<namada_proof_of_stake::BecomeValidatorError<Address>>
-    for storage_api::Error
-{
-    fn from(err: namada_proof_of_stake::BecomeValidatorError<Address>) -> Self {
-        Self::new(err)
-    }
-}
-
-impl From<namada_proof_of_stake::BondError<Address>> for storage_api::Error {
-    fn from(err: namada_proof_of_stake::BondError<Address>) -> Self {
-        Self::new(err)
-    }
-}
-
-impl From<namada_proof_of_stake::UnbondError<Address, token::Amount>>
-    for storage_api::Error
-{
-    fn from(
-        err: namada_proof_of_stake::UnbondError<Address, token::Amount>,
-    ) -> Self {
-        Self::new(err)
-    }
-}
-
-impl From<namada_proof_of_stake::WithdrawError<Address>>
-    for storage_api::Error
-{
-    fn from(err: namada_proof_of_stake::WithdrawError<Address>) -> Self {
-        Self::new(err)
-    }
-}
+// impl From<namada_proof_of_stake::BecomeValidatorError<Address>>
+//     for storage_api::Error
+// {
+//     fn from(err: namada_proof_of_stake::BecomeValidatorError<Address>) ->
+// Self {         Self::new(err)
+//     }
+// }
+
+// impl From<namada_proof_of_stake::BondError<Address>> for storage_api::Error {
+//     fn from(err: namada_proof_of_stake::BondError<Address>) -> Self {
+//         Self::new(err)
+//     }
+// }
+
+// impl From<namada_proof_of_stake::UnbondError<Address, token::Amount>>
+//     for storage_api::Error
+// {
+//     fn from(
+//         err: namada_proof_of_stake::UnbondError<Address, token::Amount>,
+//     ) -> Self {
+//         Self::new(err)
+//     }
+// }
+
+// impl From<namada_proof_of_stake::WithdrawError<Address>>
+//     for storage_api::Error
+// {
+//     fn from(err: namada_proof_of_stake::WithdrawError<Address>) -> Self {
+//         Self::new(err)
+//     }
+// }
 
 #[macro_use]
 mod macros {
diff --git a/shared/src/ledger/storage/merkle_tree.rs b/shared/src/ledger/storage/merkle_tree.rs
index 4ac2201bbe..5a7e33e2d9 100644
--- a/shared/src/ledger/storage/merkle_tree.rs
+++ b/shared/src/ledger/storage/merkle_tree.rs
@@ -10,11 +10,11 @@ use arse_merkle_tree::{
 use borsh::{BorshDeserialize, BorshSerialize};
 use ics23::commitment_proof::Proof as Ics23Proof;
 use ics23::{CommitmentProof, ExistenceProof, NonExistenceProof};
+use namada_core::types::storage::{TreeKeyError, IBC_KEY_LIMIT};
 use prost::Message;
 use thiserror::Error;
 
 use super::traits::{StorageHasher, SubTreeRead, SubTreeWrite};
-use super::IBC_KEY_LIMIT;
 use crate::bytes::ByteBuf;
 use crate::ledger::storage::ics23_specs::{self, ibc_leaf_spec};
 use crate::ledger::storage::types;
@@ -22,8 +22,7 @@ use crate::tendermint::merkle::proof::{Proof, ProofOp};
 use crate::types::address::{Address, InternalAddress};
 use crate::types::hash::Hash;
 use crate::types::storage::{
-    DbKeySeg, Error as StorageError, Key, MembershipProof, MerkleValue,
-    StringKey, TreeBytes,
+    DbKeySeg, Error as StorageError, Key, MerkleValue, StringKey, TreeBytes,
 };
 
 #[allow(missing_docs)]
@@ -33,6 +32,8 @@ pub enum Error {
     InvalidKey(StorageError),
     #[error("Invalid key for merkle tree: {0}")]
     InvalidMerkleKey(String),
+    #[error("Storage tree key error: {0}")]
+    StorageTreeKey(#[from] TreeKeyError),
     #[error("Empty Key: {0}")]
     EmptyKey(String),
     #[error("Merkle Tree error: {0}")]
@@ -829,3 +830,15 @@ mod test {
         assert!(basetree_verification_res);
     }
 }
+
+/// Type of membership proof from a merkle tree
+pub enum MembershipProof {
+    /// ICS23 compliant membership proof
+    ICS23(CommitmentProof),
+}
+
+impl From<CommitmentProof> for MembershipProof {
+    fn from(proof: CommitmentProof) -> Self {
+        Self::ICS23(proof)
+    }
+}
diff --git a/shared/src/ledger/storage/mod.rs b/shared/src/ledger/storage/mod.rs
index 16c3ecf180..16af20bd37 100644
--- a/shared/src/ledger/storage/mod.rs
+++ b/shared/src/ledger/storage/mod.rs
@@ -13,6 +13,7 @@ use std::array;
 
 use thiserror::Error;
 
+use self::merkle_tree::MembershipProof;
 use super::parameters::Parameters;
 use super::storage_api::{ResultExt, StorageRead, StorageWrite};
 use super::{parameters, storage_api};
@@ -31,15 +32,13 @@ use crate::types::chain::{ChainId, CHAIN_ID_LENGTH};
 #[cfg(feature = "ferveo-tpke")]
 use crate::types::storage::TxQueue;
 use crate::types::storage::{
-    BlockHash, BlockHeight, Epoch, Epochs, Header, Key, KeySeg,
-    MembershipProof, MerkleValue, BLOCK_HASH_LENGTH,
+    BlockHash, BlockHeight, Epoch, Epochs, Header, Key, KeySeg, MerkleValue,
+    BLOCK_HASH_LENGTH,
 };
 use crate::types::time::DateTimeUtc;
 
 /// A result of a function that may fail
 pub type Result<T> = std::result::Result<T, Error>;
-/// The maximum size of an IBC key (in bytes) allowed in merkle-ized storage
-pub const IBC_KEY_LIMIT: usize = 120;
 
 /// The storage data
 #[derive(Debug)]
diff --git a/shared/src/ledger/storage/traits.rs b/shared/src/ledger/storage/traits.rs
index e382f34d73..1f84c6e421 100644
--- a/shared/src/ledger/storage/traits.rs
+++ b/shared/src/ledger/storage/traits.rs
@@ -7,14 +7,13 @@ use arse_merkle_tree::traits::{Hasher, Value};
 use arse_merkle_tree::{Key as TreeKey, H256};
 use ics23::commitment_proof::Proof as Ics23Proof;
 use ics23::{CommitmentProof, ExistenceProof};
+use namada_core::types::storage::IBC_KEY_LIMIT;
 use sha2::{Digest, Sha256};
 
-use super::merkle_tree::{Amt, Error, Smt};
-use super::{ics23_specs, IBC_KEY_LIMIT};
+use super::ics23_specs;
+use super::merkle_tree::{Amt, Error, MembershipProof, Smt};
 use crate::types::hash::Hash;
-use crate::types::storage::{
-    Key, MembershipProof, MerkleValue, StringKey, TreeBytes,
-};
+use crate::types::storage::{Key, MerkleValue, StringKey, TreeBytes};
 
 /// Trait for reading from a merkle tree that is a sub-tree
 /// of the global merkle tree.
@@ -159,74 +158,6 @@ impl<'a, H: StorageHasher + Default> SubTreeWrite for &'a mut Amt<H> {
     }
 }
 
-impl TreeKey<IBC_KEY_LIMIT> for StringKey {
-    type Error = Error;
-
-    fn as_slice(&self) -> &[u8] {
-        &self.original.as_slice()[..self.length]
-    }
-
-    fn try_from_bytes(bytes: &[u8]) -> Result<Self, Error> {
-        let mut tree_key = [0u8; IBC_KEY_LIMIT];
-        let mut original = [0u8; IBC_KEY_LIMIT];
-        let mut length = 0;
-        for (i, byte) in bytes.iter().enumerate() {
-            if i >= IBC_KEY_LIMIT {
-                return Err(Error::InvalidMerkleKey(
-                    "Input IBC key is too large".into(),
-                ));
-            }
-            original[i] = *byte;
-            tree_key[i] = byte.wrapping_add(1);
-            length += 1;
-        }
-        Ok(Self {
-            original,
-            tree_key: tree_key.into(),
-            length,
-        })
-    }
-}
-
-impl Value for Hash {
-    fn as_slice(&self) -> &[u8] {
-        self.0.as_slice()
-    }
-
-    fn zero() -> Self {
-        Hash([0u8; 32])
-    }
-}
-
-impl From<Hash> for H256 {
-    fn from(hash: Hash) -> Self {
-        hash.0.into()
-    }
-}
-
-impl From<H256> for Hash {
-    fn from(hash: H256) -> Self {
-        Self(hash.into())
-    }
-}
-
-impl From<&H256> for Hash {
-    fn from(hash: &H256) -> Self {
-        let hash = hash.to_owned();
-        Self(hash.into())
-    }
-}
-
-impl Value for TreeBytes {
-    fn as_slice(&self) -> &[u8] {
-        self.0.as_slice()
-    }
-
-    fn zero() -> Self {
-        TreeBytes::zero()
-    }
-}
-
 /// The storage hasher used for the merkle tree.
 pub trait StorageHasher: Hasher + Default {
     /// Hash the value to store
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
index 6faaf2ff36..108037a8a2 100644
--- a/shared/src/lib.rs
+++ b/shared/src/lib.rs
@@ -15,7 +15,6 @@ pub use {
     tendermint_proto_abcipp as tendermint_proto,
 };
 
-pub mod bytes;
 pub mod ledger;
 pub mod proto;
 pub mod types;
diff --git a/shared/src/types/dylib.rs b/shared/src/types/dylib.rs
deleted file mode 100644
index d8dcc7eaae..0000000000
--- a/shared/src/types/dylib.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//! Dynamic library helpers
-
-/// The file extension for dynamic library for this target
-#[allow(dead_code)]
-#[cfg(windows)]
-pub const FILE_EXT: &str = "dll";
-
-/// The file extension for dynamic library for this target
-#[allow(dead_code)]
-#[cfg(target_os = "macos")]
-pub const FILE_EXT: &str = "dylib";
-
-/// The file extension for dynamic library for this target
-#[allow(dead_code)]
-#[cfg(all(unix, not(target_os = "macos")))]
-pub const FILE_EXT: &str = "so";
diff --git a/shared/src/types/mod.rs b/shared/src/types/mod.rs
index b8895c095d..e5abc7a2ae 100644
--- a/shared/src/types/mod.rs
+++ b/shared/src/types/mod.rs
@@ -1,15 +1,10 @@
 //! Types definitions.
 
-pub mod address;
-pub mod chain;
-pub mod dylib;
-pub mod governance;
-pub mod hash;
 pub mod ibc;
 pub mod internal;
 pub mod key;
-pub mod storage;
-pub mod time;
-pub mod token;
 pub mod transaction;
-pub mod validity_predicate;
+
+pub use namada_core::types::{
+    address, chain, governance, hash, storage, time, token, validity_predicate,
+};
diff --git a/shared/src/types/transaction/governance.rs b/shared/src/types/transaction/governance.rs
index 21f96485c2..31a11572fb 100644
--- a/shared/src/types/transaction/governance.rs
+++ b/shared/src/types/transaction/governance.rs
@@ -1,4 +1,5 @@
 use borsh::{BorshDeserialize, BorshSerialize};
+use namada_core::types::governance::{Proposal, ProposalError};
 use serde::{Deserialize, Serialize};
 
 use crate::types::address::Address;
@@ -52,3 +53,28 @@ pub struct VoteProposalData {
     /// Delegator addreses
     pub delegations: Vec<Address>,
 }
+
+impl TryFrom<Proposal> for InitProposalData {
+    type Error = ProposalError;
+
+    fn try_from(proposal: Proposal) -> Result<Self, Self::Error> {
+        let proposal_code = if let Some(path) = proposal.proposal_code_path {
+            match std::fs::read(path) {
+                Ok(bytes) => Some(bytes),
+                Err(_) => return Err(Self::Error::InvalidProposalData),
+            }
+        } else {
+            None
+        };
+
+        Ok(InitProposalData {
+            id: proposal.id,
+            content: proposal.content.try_to_vec().unwrap(),
+            author: proposal.author,
+            voting_start_epoch: proposal.voting_start_epoch,
+            voting_end_epoch: proposal.voting_end_epoch,
+            grace_epoch: proposal.grace_epoch,
+            proposal_code,
+        })
+    }
+}