Reorganize folders.

.github/workflows/cairo-ci.yaml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./stwo_cairo_verifier
+        working-directory: ./stwo_verifier_core
     steps:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1

stwo_cairo_verifier/Scarb.lock

@@ -6,7 +6,7 @@ name = "bounded_int"
 version = "0.1.0"
 
 [[package]]
-name = "stwo_cairo_verifier"
+name = "stwo_verifier_core"
 version = "0.1.0"
 dependencies = [
  "bounded_int",

stwo_cairo_verifier/Scarb.toml

@@ -1,19 +1,5 @@
 [workspace]
-members = ["bounded_int"]
-
-[package]
-name = "stwo_cairo_verifier"
-version = "0.1.0"
-edition = "2024_07"
-
-[lib]
-casm = true
-
-[tool.fmt]
-sort-module-level-items = true
-
-[dependencies]
-bounded_int = { path = "bounded_int" }
-
-[dev-dependencies]
-cairo_test = "2.9.2"
+members = [
+    "crates/bounded_int",
+    "crates/verifier_core",
+]

stwo_cairo_verifier/bounded_int/src/lib.cairo → stwo_cairo_verifier/crates/bounded_int/src/lib.cairo

@@ -1,8 +1,7 @@
 //! Utility crate that exports internal corelib function.
 //! This crate is compiled with an older edition that does not enforce visibity rules.
 
+use core::integer::upcast;
 use core::internal::bounded_int::{
-    BoundedInt, add, constrain, div_rem, sub, AddHelper, ConstrainHelper, DivRemHelper, SubHelper,
+    AddHelper, BoundedInt, ConstrainHelper, DivRemHelper, SubHelper, add, constrain, div_rem, sub,
 };
-
-use core::integer::upcast;

stwo_cairo_verifier/crates/verifier_core/Scarb.toml

@@ -0,0 +1,16 @@
+[package]
+name = "stwo_verifier_core"
+version = "0.1.0"
+edition = "2024_07"
+
+[lib]
+casm = true
+
+[tool.fmt]
+sort-module-level-items = true
+
+[dependencies]
+bounded_int = { path = "../bounded_int" }
+
+[dev-dependencies]
+cairo_test = "2.9.2"

stwo_cairo_verifier/tests/verifier.cairo → stwo_cairo_verifier/crates/verifier_core/tests/verifier.cairo

@@ -1,15 +1,15 @@
-use stwo_cairo_verifier::channel::ChannelImpl;
-use stwo_cairo_verifier::circle::{
+use stwo_verifier_core::channel::ChannelImpl;
+use stwo_verifier_core::circle::{
     CirclePoint, CirclePointIndexImpl, CirclePointQM31AddCirclePointM31Impl,
 };
-use stwo_cairo_verifier::fields::qm31::{QM31, QM31Impl, QM31One, QM31Zero};
-use stwo_cairo_verifier::fri::FriConfig;
-use stwo_cairo_verifier::pcs::PcsConfig;
-use stwo_cairo_verifier::pcs::verifier::CommitmentSchemeVerifierImpl;
-use stwo_cairo_verifier::poly::circle::CanonicCosetImpl;
-use stwo_cairo_verifier::utils::ArrayImpl;
-use stwo_cairo_verifier::verifier::{Air, verify};
-use stwo_cairo_verifier::{ColumnArray, TreeArray};
+use stwo_verifier_core::fields::qm31::{QM31, QM31Impl, QM31One, QM31Zero};
+use stwo_verifier_core::fri::FriConfig;
+use stwo_verifier_core::pcs::PcsConfig;
+use stwo_verifier_core::pcs::verifier::CommitmentSchemeVerifierImpl;
+use stwo_verifier_core::poly::circle::CanonicCosetImpl;
+use stwo_verifier_core::utils::ArrayImpl;
+use stwo_verifier_core::verifier::{Air, verify};
+use stwo_verifier_core::{ColumnArray, TreeArray};
 
 mod proofs;