diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21fe54a..cbcc0ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,6 @@ name: Build
 
 on: [push, pull_request]
 
-env:
-  SCARB_VERSION: 0.7.0
-
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -12,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "0.7.0"
+          scarb-version: "2.3.1"
       - name: Check cairo format
         run: scarb fmt --check
       - name: Build cairo programs
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 50de7e6..b00216a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,8 +3,7 @@ name: Test
 on: [push, pull_request]
 
 env:
-  SCARB_VERSION: 0.7.0
-  STARKNET_FOUNDRY_VERSION: 0.5.0
+  STARKNET_FOUNDRY_VERSION: 0.9.1
 
 jobs:
   check:
@@ -13,8 +12,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "0.7.0"
+          scarb-version: "2.3.1"
       - name: Install starknet foundry
         run: curl -L https://raw.githubusercontent.com/foundry-rs/starknet-foundry/master/scripts/install.sh | sh -s -- -v ${STARKNET_FOUNDRY_VERSION}
       - name: Run cairo tests
-        run: snforge
+        run: snforge test
diff --git a/.tool-versions b/.tool-versions
index ce84f33..963d7a0 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-scarb 0.7.0
\ No newline at end of file
+scarb 2.3.1
\ No newline at end of file
diff --git a/README.md b/README.md
index 781aa1d..beecf3b 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@
 
 <p align="center">
   <a href="LICENSE">
-    <img src="https://img.shields.io/github/license/abdelhamidbakhta/tokei.svg?style=flat-square" alt="Project license">
+    <img src="https://img.shields.io/github/license/starknet-io/tokei.svg?style=flat-square" alt="Project license">
   </a>
-  <a href="https://github.com/abdelhamidbakhta/tokei/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22">
+  <a href="https://github.com/starknet-io/tokei/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22">
     <img src="https://img.shields.io/badge/PRs-welcome-ff69b4.svg?style=flat-square" alt="Pull Requests welcome">
   </a>
-  <a href="https://abdelhamidbakhta.github.io/tokei/">
+  <a href="https://starknet-io.github.io/tokei/">
     <img src="https://img.shields.io/badge/Read-Tokei_Book-blue" alt="Read Tokei Book">
   </a>
 </p>
@@ -29,7 +29,7 @@
 
 Tokei is a token streaming protocol, inspired by Sablier, for Starknet.
 
-Read the [Tokei Book](https://abdelhamidbakhta.github.io/tokei/) to learn more about the project.
+Read the [Tokei Book](https://starknet-io.github.io/tokei/) to learn more about the project.
 
 ## 🛠️ Build
 
@@ -51,7 +51,7 @@ snforge
 
 Here are some resources to help you get started:
 
-- [Tokei Book](https://abdelhamidbakhta.github.io/tokei/)
+- [Tokei Book](https://starknet-io.github.io/tokei/)
 - [Cairo Book](https://book.cairo-lang.org/)
 - [Starknet Book](https://book.starknet.io/)
 - [Starknet Foundry Book](https://foundry-rs.github.io/starknet-foundry/)
diff --git a/Scarb.lock b/Scarb.lock
new file mode 100644
index 0000000..5f846f2
--- /dev/null
+++ b/Scarb.lock
@@ -0,0 +1,14 @@
+# Code generated by scarb DO NOT EDIT.
+version = 1
+
+[[package]]
+name = "snforge_std"
+version = "0.1.0"
+source = "git+https://github.com/foundry-rs/starknet-foundry.git?tag=v0.9.1#da085bd11e1b151d0592f43917136560d9b70d37"
+
+[[package]]
+name = "tokei"
+version = "0.1.0"
+dependencies = [
+ "snforge_std",
+]
diff --git a/Scarb.toml b/Scarb.toml
index 8b3a6c2..e184972 100644
--- a/Scarb.toml
+++ b/Scarb.toml
@@ -1,13 +1,13 @@
 [package]
 name = "tokei"
 version = "0.1.0"
-authors = ["Abdelhamid Bakhta <@abdelhamidbakhta>"]
+authors = ["Abdelhamid Bakhta <@starknet-io>"]
 license = "MIT"
 keywords = ["starknet", "vesting"]
 description = "✨ 🐺 Starknet ERC20 token vesting smart contracts 💰⏳"
-documentation = "https://github.com/abdelhamidbakhta/tokei"
-homepage = "https://github.com/abdelhamidbakhta/tokei"
-repository = "https://github.com/abdelhamidbakhta/tokei"
+documentation = "https://github.com/starknet-io/tokei"
+homepage = "https://github.com/starknet-io/tokei"
+repository = "https://github.com/starknet-io/tokei"
 
 [[target.starknet-contract]]
 sierra = true
@@ -18,8 +18,8 @@ allowed-libfuncs-list.name = "experimental"
 sierra-replace-ids = true
 
 [dependencies]
-starknet = ">=2.1.0"
-snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.5.0" }
+starknet = ">=2.3.1"
+snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry.git", tag = "v0.9.1" }
 
 
 [tool.snforge]
diff --git a/book/book.toml b/book/book.toml
index a031546..485c57d 100644
--- a/book/book.toml
+++ b/book/book.toml
@@ -1,13 +1,13 @@
 [book]
-authors = ["@abdelhamidbakhta"]
+authors = ["@starknet-io"]
 language = "en"
 multilingual = false
 src = "src"
 title = "Tokei Book"
 
 [output.html]
-git-repository-url = "https://github.com/abdelhamidbakhta/tokei"
-edit-url-template = "https://github.com/abdelhamidbakhta/tokei/book/{path}"
+git-repository-url = "https://github.com/starknet-io/tokei"
+edit-url-template = "https://github.com/starknet-io/tokei/book/{path}"
 
 [output.html.playground]
 runnable = false