diff --git a/.gitignore b/.gitignore
index c8811a1..a39471d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .vscode/
 .idea/
 **/*~
-.vessel/
+.mops/
 
 # Github Access Token
 gittoken.key
diff --git a/dfx.json b/dfx.json
index 652d955..def351f 100644
--- a/dfx.json
+++ b/dfx.json
@@ -123,7 +123,7 @@
     "defaults": {
         "build": {
             "args": "",
-            "packtool": "vessel sources"
+            "packtool": "mops sources"
         },
         "replica": {
             "subnet_type": "system"
diff --git a/mops.toml b/mops.toml
new file mode 100644
index 0000000..68b9df9
--- /dev/null
+++ b/mops.toml
@@ -0,0 +1,22 @@
+[dependencies]
+base = "0.7.6"
+array = "https://github.com/aviate-labs/array.mo#v0.2.0"
+crypto = "https://github.com/aviate-labs/crypto.mo#v0.2.0"
+hash = "https://github.com/aviate-labs/hash.mo#v0.1.0"
+encoding = "https://github.com/aviate-labs/encoding.mo#v0.3.2"
+matchers = "https://github.com/kritzcreek/motoko-matchers#7f95f69ae9a399cedf161d90738db822f315c07e"
+candy_0_1_10 = "https://github.com/icdevs/candy_library#v0.1.10"
+candy_0_1_12 = "https://github.com/icdevs/candy_library#v0.1.12"
+candy = "https://github.com/icdevs/candy_library#v0.1.12"
+principalmo = "https://github.com/aviate-labs/principal.mo#v0.2.5"
+ext = "https://github.com/skilesare/extendable-token#v0.1.0"
+httpparser = "https://github.com/skilesare/http-parser.mo#v0.1.0"
+http = "https://github.com/aviate-labs/http.mo#v0.1.0"
+json = "https://github.com/aviate-labs/json.mo#v0.1.0"
+format = "https://github.com/skilesare/format.mo#v0.1.0"
+stablebuffer_0_2_0 = "https://github.com/skilesare/StableBuffer#v0.2.0"
+map_6_0_0 = "https://github.com/ZhenyaUsenko/motoko-hash-map#v6.0.0"
+map_7_0_0 = "https://github.com/ZhenyaUsenko/motoko-hash-map#v7.0.0"
+map = "https://github.com/ZhenyaUsenko/motoko-hash-map#v7.0.0"
+stablebuffer = "https://github.com/skilesare/StableBuffer#v0.2.0"
+canistergeek = "https://github.com/ORIGYN-SA/canistergeek-motoko#v0.0.1"
diff --git a/package-set.dhall b/package-set.dhall
deleted file mode 100644
index 844d01d..0000000
--- a/package-set.dhall
+++ /dev/null
@@ -1,138 +0,0 @@
-let aviate_labs = https://github.com/aviate-labs/package-set/releases/download/v0.1.3/package-set.dhall sha256:ca68dad1e4a68319d44c587f505176963615d533b8ac98bdb534f37d1d6a5b47
-
-let upstream = https://github.com/dfinity/vessel-package-set/releases/download/mo-0.8.3-20230224/package-set.dhall 
-
-let Package =
-    { name : Text, version : Text, repo : Text, dependencies : List Text }
-
-
-let additions =
-
-    [
-   { name = "candy_0_1_10"
-    , repo = "https://github.com/icdevs/candy_library.git"
-    , version = "v0.1.10"
-    , dependencies = ["base"]
-   },
-   { name = "candy_0_1_12"
-    , repo = "https://github.com/icdevs/candy_library.git"
-    , version = "v0.1.12"
-    , dependencies = ["base"]
-   },
-    { name = "candy"
-    , repo = "https://github.com/icdevs/candy_library.git"
-    , version = "v0.1.12"
-    , dependencies = ["base"]
-   },
-   {
-       name="principalmo",
-       repo = "https://github.com/aviate-labs/principal.mo.git",
-       version = "v0.2.5",
-       dependencies = ["base"]
-   },
-   { name = "crypto"
-    , repo = "https://github.com/aviate-labs/crypto.mo"
-    , version = "v0.2.0"
-    , dependencies = [ "base", "encoding" ]
-
-  },
-  { name="principalmo"
-  , repo = "https://github.com/aviate-labs/principal.mo.git"
-  , version = "v0.2.5"
-  , dependencies = ["base"]
-  },
-  { name = "crypto"
-  , repo = "https://github.com/aviate-labs/crypto.mo"
-  , version = "v0.2.0"
-  , dependencies = [ "base", "encoding" ]
-  },
-  { name = "encoding"
-  , repo = "https://github.com/aviate-labs/encoding.mo"
-  , version = "v0.3.2"
-  , dependencies = [ "array", "base" ]
-  },
-  { name = "array"
-  , repo = "https://github.com/aviate-labs/array.mo"
-  , version = "v0.2.0"
-  , dependencies = [ "base" ]
-  },
-  { name = "hash"
-  , repo = "https://github.com/aviate-labs/hash.mo"
-  , version = "v0.1.0"
-  , dependencies = [ "array", "base" ]
-  },
-  { name = "ext"
-  , repo = "https://github.com/skilesare/extendable-token"
-  , version = "v0.1.0"
-  , dependencies = ["ext"]
-  },
-  { name = "httpparser"
-  , repo = "https://github.com/skilesare/http-parser.mo"
-  , version = "v0.1.0"
-  , dependencies = ["base"]
-  },
-  { name = "http"
-  , repo = "https://github.com/aviate-labs/http.mo"
-  , version = "v0.1.0"
-  , dependencies = [ "base" ]
-  },
-  { name = "format"
-  , repo = "https://github.com/skilesare/format.mo"
-  , version = "v0.1.0"
-  , dependencies = [ "base" ]
-  },
-  { name = "json"
-  , repo = "https://github.com/aviate-labs/json.mo"
-  , version = "v0.1.0"
-  , dependencies = [ "base", "parser-combinators" ]
-  },
-  
-  { name = "stablebuffer_0_2_0"
-  , repo = "https://github.com/skilesare/StableBuffer"
-  , version = "v0.2.0"
-  , dependencies = [ "base"]
-  },
-  { name = "stablebuffer"
-  , repo = "https://github.com/skilesare/StableBuffer"
-  , version = "v0.2.0"
-  , dependencies = [ "base"]
-  },
-  { name = "map_7_0_0"
-  , repo = "https://github.com/ZhenyaUsenko/motoko-hash-map"
-  , version = "v7.0.0"
-  , dependencies = [ "base"]
-  },
-  { name = "map_6_0_0"
-  , repo = "https://github.com/ZhenyaUsenko/motoko-hash-map"
-  , version = "v6.0.0"
-  , dependencies = [ "base"]
-  },
-  { name = "map"
-  , repo = "https://github.com/ZhenyaUsenko/motoko-hash-map"
-  , version = "v7.0.0"
-  , dependencies = [ "base"]
-
-  },
-  { name = "canistergeek"
-  , repo = "https://github.com/ORIGYN-SA/canistergeek-motoko"
-  , version = "v0.0.1"
-  , dependencies = ["base", "candy_0_1_10" ]
-  }
-  ] : List Package
-
-let
-  {- This is where you can override existing packages in the package-set
-
-     For example, if you wanted to use version `v2.0.0` of the foo library:
-     let overrides = [
-         { name = "foo"
-         , version = "v2.0.0"
-         , repo = "https://github.com/bar/foo"
-         , dependencies = [] : List Text
-         }
-     ]
-  -}
-  overrides =
-    [] : List Package
-
-in  aviate_labs # upstream # additions # overrides
diff --git a/vessel.dhall b/vessel.dhall
deleted file mode 100644
index 30d7704..0000000
--- a/vessel.dhall
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  dependencies = [ "base", "array",  "crypto", "hash", "encoding", "matchers","candy_0_1_10","candy_0_1_12","candy", "principalmo","ext","httpparser","http","json","format","stablebuffer_0_2_0","map_6_0_0","map_7_0_0","map","stablebuffer", "canistergeek" ],
-  compiler = Some "0.7.6"
-}