Rename top-level directories.

In the future we want to add a `go` directory that contains the Go bindings for YARA-X. Having a `yara-x-go` directory is not ideal, because the import path for that Go module would be `github.com/VirusTotal/yara-x/yara-x-go`. Instead we want the more natural `github.com/VirusTotal/yara-x/go`. However, adding a `go` directory makes the current naming incoherent, but with this change everything fits well again.
VirusTotal · Feb 9, 2024 · c8af699 · c8af699
1 parent 0443b6e
commit c8af699
Show file tree

Hide file tree

Showing 365 changed files with 45 additions and 44 deletions.
diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
@@ -47,8 +47,8 @@ jobs:
           pwd
           python -m pip install --upgrade pip maturin
           python -m pip install pytest
-          maturin develop --manifest-path yara-x-py/Cargo.toml
-          pytest yara-x-py
+          maturin develop --manifest-path py/Cargo.toml
+          pytest py
           
       # Non-windows
       - name: Test Python - Non-Windows
@@ -58,6 +58,6 @@ jobs:
           virtualenv venv; source venv/bin/activate
           python -m pip install --upgrade pip maturin
           python -m pip install pytest
-          maturin develop --manifest-path yara-x-py/Cargo.toml
-          pytest yara-x-py
+          maturin develop --manifest-path py/Cargo.toml
+          pytest py
 
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,14 +15,15 @@ rust-version = "1.73.0"
 
 [workspace]
 members = [
-    "yara-x",
-    "yara-x-cli",
-    "yara-x-fmt",
-    "yara-x-macros",
-    "yara-x-parser",
-    "yara-x-proto",
-    "yara-x-proto-yaml",
-    "yara-x-py",
+    "lib",
+    "clib",
+    "cli",
+    "fmt",
+    "macros",
+    "parser",
+    "proto",
+    "proto-yaml",
+    "py",
 ]
 resolver = "2"
 
@@ -84,12 +85,12 @@ walrus = "0.20.2"
 wasmtime = "17.0.0"
 yaml-rust = "0.4.5"
 yansi = "0.5.1"
-yara-x = { path = "yara-x" }
-yara-x-fmt = { path = "yara-x-fmt" }
-yara-x-macros = { path = "yara-x-macros" }
-yara-x-parser = { path = "yara-x-parser" }
-yara-x-proto = { path = "yara-x-proto" }
-yara-x-proto-yaml = { path = "yara-x-proto-yaml" }
+yara-x = { path = "lib" }
+yara-x-fmt = { path = "fmt" }
+yara-x-macros = { path = "macros" }
+yara-x-parser = { path = "parser" }
+yara-x-proto = { path = "proto" }
+yara-x-proto-yaml = { path = "proto-yaml" }
 
 # Special profile that builds a release binary with link-time optimization. 
 # Compiling with this profile takes a while, but the resulting binary is

diff --git a/yara-x-cli/Cargo.toml → cli/Cargo.toml b/yara-x-cli/Cargo.toml → cli/Cargo.toml
diff --git a/yara-x-cli/src/commands/check.rs → cli/src/commands/check.rs b/yara-x-cli/src/commands/check.rs → cli/src/commands/check.rs
diff --git a/yara-x-cli/src/commands/compile.rs → cli/src/commands/compile.rs b/yara-x-cli/src/commands/compile.rs → cli/src/commands/compile.rs
diff --git a/yara-x-cli/src/commands/debug.rs → cli/src/commands/debug.rs b/yara-x-cli/src/commands/debug.rs → cli/src/commands/debug.rs
diff --git a/yara-x-cli/src/commands/dump.rs → cli/src/commands/dump.rs b/yara-x-cli/src/commands/dump.rs → cli/src/commands/dump.rs
diff --git a/yara-x-cli/src/commands/fmt.rs → cli/src/commands/fmt.rs b/yara-x-cli/src/commands/fmt.rs → cli/src/commands/fmt.rs
diff --git a/yara-x-cli/src/commands/mod.rs → cli/src/commands/mod.rs b/yara-x-cli/src/commands/mod.rs → cli/src/commands/mod.rs
diff --git a/yara-x-cli/src/commands/scan.rs → cli/src/commands/scan.rs b/yara-x-cli/src/commands/scan.rs → cli/src/commands/scan.rs
@@ -290,13 +290,13 @@ fn print_matching_rules(
             format!(
                 "{}:{} {}",
                 Cyan.paint(matching_rule.namespace()).bold(),
-                Cyan.paint(matching_rule.name()).bold(),
+                Cyan.paint(matching_rule.identifier()).bold(),
                 file_path.display(),
             )
         } else {
             format!(
                 "{} {}",
-                Cyan.paint(matching_rule.name()).bold(),
+                Cyan.paint(matching_rule.identifier()).bold(),
                 file_path.display()
             )
         };

diff --git a/yara-x-cli/src/help.rs → cli/src/help.rs b/yara-x-cli/src/help.rs → cli/src/help.rs
diff --git a/yara-x-cli/src/main.rs → cli/src/main.rs b/yara-x-cli/src/main.rs → cli/src/main.rs
diff --git a/yara-x-cli/src/walk.rs → cli/src/walk.rs b/yara-x-cli/src/walk.rs → cli/src/walk.rs
diff --git a/yara-x-fmt/Cargo.lock → fmt/Cargo.lock b/yara-x-fmt/Cargo.lock → fmt/Cargo.lock
diff --git a/yara-x-fmt/Cargo.toml → fmt/Cargo.toml b/yara-x-fmt/Cargo.toml → fmt/Cargo.toml
diff --git a/yara-x-fmt/src/align.rs → fmt/src/align.rs b/yara-x-fmt/src/align.rs → fmt/src/align.rs
diff --git a/yara-x-fmt/src/bubble.rs → fmt/src/bubble.rs b/yara-x-fmt/src/bubble.rs → fmt/src/bubble.rs
diff --git a/yara-x-fmt/src/comments.rs → fmt/src/comments.rs b/yara-x-fmt/src/comments.rs → fmt/src/comments.rs
diff --git a/yara-x-fmt/src/indentation.rs → fmt/src/indentation.rs b/yara-x-fmt/src/indentation.rs → fmt/src/indentation.rs
diff --git a/yara-x-fmt/src/lib.rs → fmt/src/lib.rs b/yara-x-fmt/src/lib.rs → fmt/src/lib.rs
diff --git a/yara-x-fmt/src/processor/mod.rs → fmt/src/processor/mod.rs b/yara-x-fmt/src/processor/mod.rs → fmt/src/processor/mod.rs
diff --git a/yara-x-fmt/src/processor/tests.rs → fmt/src/processor/tests.rs b/yara-x-fmt/src/processor/tests.rs → fmt/src/processor/tests.rs
diff --git a/yara-x-fmt/src/testdata/test1.formatted → fmt/src/testdata/test1.formatted b/yara-x-fmt/src/testdata/test1.formatted → fmt/src/testdata/test1.formatted
diff --git a/yara-x-fmt/src/testdata/test1.unformatted → fmt/src/testdata/test1.unformatted b/yara-x-fmt/src/testdata/test1.unformatted → fmt/src/testdata/test1.unformatted
diff --git a/yara-x-fmt/src/testdata/test10.formatted → fmt/src/testdata/test10.formatted b/yara-x-fmt/src/testdata/test10.formatted → fmt/src/testdata/test10.formatted
diff --git a/yara-x-fmt/src/testdata/test10.unformatted → fmt/src/testdata/test10.unformatted b/yara-x-fmt/src/testdata/test10.unformatted → fmt/src/testdata/test10.unformatted
diff --git a/yara-x-fmt/src/testdata/test11.formatted → fmt/src/testdata/test11.formatted b/yara-x-fmt/src/testdata/test11.formatted → fmt/src/testdata/test11.formatted
diff --git a/yara-x-fmt/src/testdata/test11.unformatted → fmt/src/testdata/test11.unformatted b/yara-x-fmt/src/testdata/test11.unformatted → fmt/src/testdata/test11.unformatted
diff --git a/yara-x-fmt/src/testdata/test12.formatted → fmt/src/testdata/test12.formatted b/yara-x-fmt/src/testdata/test12.formatted → fmt/src/testdata/test12.formatted
diff --git a/yara-x-fmt/src/testdata/test12.unformatted → fmt/src/testdata/test12.unformatted b/yara-x-fmt/src/testdata/test12.unformatted → fmt/src/testdata/test12.unformatted
diff --git a/yara-x-fmt/src/testdata/test13.formatted → fmt/src/testdata/test13.formatted b/yara-x-fmt/src/testdata/test13.formatted → fmt/src/testdata/test13.formatted
diff --git a/yara-x-fmt/src/testdata/test13.unformatted → fmt/src/testdata/test13.unformatted b/yara-x-fmt/src/testdata/test13.unformatted → fmt/src/testdata/test13.unformatted
diff --git a/yara-x-fmt/src/testdata/test14.formatted → fmt/src/testdata/test14.formatted b/yara-x-fmt/src/testdata/test14.formatted → fmt/src/testdata/test14.formatted
diff --git a/yara-x-fmt/src/testdata/test14.unformatted → fmt/src/testdata/test14.unformatted b/yara-x-fmt/src/testdata/test14.unformatted → fmt/src/testdata/test14.unformatted
diff --git a/yara-x-fmt/src/testdata/test15.formatted → fmt/src/testdata/test15.formatted b/yara-x-fmt/src/testdata/test15.formatted → fmt/src/testdata/test15.formatted
diff --git a/yara-x-fmt/src/testdata/test15.unformatted → fmt/src/testdata/test15.unformatted b/yara-x-fmt/src/testdata/test15.unformatted → fmt/src/testdata/test15.unformatted
diff --git a/yara-x-fmt/src/testdata/test16.formatted → fmt/src/testdata/test16.formatted b/yara-x-fmt/src/testdata/test16.formatted → fmt/src/testdata/test16.formatted
diff --git a/yara-x-fmt/src/testdata/test16.unformatted → fmt/src/testdata/test16.unformatted b/yara-x-fmt/src/testdata/test16.unformatted → fmt/src/testdata/test16.unformatted
diff --git a/yara-x-fmt/src/testdata/test17.formatted → fmt/src/testdata/test17.formatted b/yara-x-fmt/src/testdata/test17.formatted → fmt/src/testdata/test17.formatted
diff --git a/yara-x-fmt/src/testdata/test17.unformatted → fmt/src/testdata/test17.unformatted b/yara-x-fmt/src/testdata/test17.unformatted → fmt/src/testdata/test17.unformatted
diff --git a/yara-x-fmt/src/testdata/test18.formatted → fmt/src/testdata/test18.formatted b/yara-x-fmt/src/testdata/test18.formatted → fmt/src/testdata/test18.formatted
diff --git a/yara-x-fmt/src/testdata/test18.unformatted → fmt/src/testdata/test18.unformatted b/yara-x-fmt/src/testdata/test18.unformatted → fmt/src/testdata/test18.unformatted
diff --git a/yara-x-fmt/src/testdata/test19.formatted → fmt/src/testdata/test19.formatted b/yara-x-fmt/src/testdata/test19.formatted → fmt/src/testdata/test19.formatted
diff --git a/yara-x-fmt/src/testdata/test19.unformatted → fmt/src/testdata/test19.unformatted b/yara-x-fmt/src/testdata/test19.unformatted → fmt/src/testdata/test19.unformatted
diff --git a/yara-x-fmt/src/testdata/test2.formatted → fmt/src/testdata/test2.formatted b/yara-x-fmt/src/testdata/test2.formatted → fmt/src/testdata/test2.formatted
diff --git a/yara-x-fmt/src/testdata/test2.unformatted → fmt/src/testdata/test2.unformatted b/yara-x-fmt/src/testdata/test2.unformatted → fmt/src/testdata/test2.unformatted
diff --git a/yara-x-fmt/src/testdata/test20.formatted → fmt/src/testdata/test20.formatted b/yara-x-fmt/src/testdata/test20.formatted → fmt/src/testdata/test20.formatted
diff --git a/yara-x-fmt/src/testdata/test20.unformatted → fmt/src/testdata/test20.unformatted b/yara-x-fmt/src/testdata/test20.unformatted → fmt/src/testdata/test20.unformatted
diff --git a/yara-x-fmt/src/testdata/test21.formatted → fmt/src/testdata/test21.formatted b/yara-x-fmt/src/testdata/test21.formatted → fmt/src/testdata/test21.formatted
diff --git a/yara-x-fmt/src/testdata/test21.unformatted → fmt/src/testdata/test21.unformatted b/yara-x-fmt/src/testdata/test21.unformatted → fmt/src/testdata/test21.unformatted
diff --git a/yara-x-fmt/src/testdata/test22.formatted → fmt/src/testdata/test22.formatted b/yara-x-fmt/src/testdata/test22.formatted → fmt/src/testdata/test22.formatted
diff --git a/yara-x-fmt/src/testdata/test22.unformatted → fmt/src/testdata/test22.unformatted b/yara-x-fmt/src/testdata/test22.unformatted → fmt/src/testdata/test22.unformatted
diff --git a/yara-x-fmt/src/testdata/test23.formatted → fmt/src/testdata/test23.formatted b/yara-x-fmt/src/testdata/test23.formatted → fmt/src/testdata/test23.formatted
diff --git a/yara-x-fmt/src/testdata/test23.unformatted → fmt/src/testdata/test23.unformatted b/yara-x-fmt/src/testdata/test23.unformatted → fmt/src/testdata/test23.unformatted
diff --git a/yara-x-fmt/src/testdata/test24.formatted → fmt/src/testdata/test24.formatted b/yara-x-fmt/src/testdata/test24.formatted → fmt/src/testdata/test24.formatted
diff --git a/yara-x-fmt/src/testdata/test24.unformatted → fmt/src/testdata/test24.unformatted b/yara-x-fmt/src/testdata/test24.unformatted → fmt/src/testdata/test24.unformatted
diff --git a/yara-x-fmt/src/testdata/test25.formatted → fmt/src/testdata/test25.formatted b/yara-x-fmt/src/testdata/test25.formatted → fmt/src/testdata/test25.formatted
diff --git a/yara-x-fmt/src/testdata/test25.unformatted → fmt/src/testdata/test25.unformatted b/yara-x-fmt/src/testdata/test25.unformatted → fmt/src/testdata/test25.unformatted
diff --git a/yara-x-fmt/src/testdata/test26.formatted → fmt/src/testdata/test26.formatted b/yara-x-fmt/src/testdata/test26.formatted → fmt/src/testdata/test26.formatted
diff --git a/yara-x-fmt/src/testdata/test26.unformatted → fmt/src/testdata/test26.unformatted b/yara-x-fmt/src/testdata/test26.unformatted → fmt/src/testdata/test26.unformatted
diff --git a/yara-x-fmt/src/testdata/test27.formatted → fmt/src/testdata/test27.formatted b/yara-x-fmt/src/testdata/test27.formatted → fmt/src/testdata/test27.formatted
diff --git a/yara-x-fmt/src/testdata/test27.unformatted → fmt/src/testdata/test27.unformatted b/yara-x-fmt/src/testdata/test27.unformatted → fmt/src/testdata/test27.unformatted
diff --git a/yara-x-fmt/src/testdata/test28.formatted → fmt/src/testdata/test28.formatted b/yara-x-fmt/src/testdata/test28.formatted → fmt/src/testdata/test28.formatted
diff --git a/yara-x-fmt/src/testdata/test28.unformatted → fmt/src/testdata/test28.unformatted b/yara-x-fmt/src/testdata/test28.unformatted → fmt/src/testdata/test28.unformatted
diff --git a/yara-x-fmt/src/testdata/test29.formatted → fmt/src/testdata/test29.formatted b/yara-x-fmt/src/testdata/test29.formatted → fmt/src/testdata/test29.formatted
diff --git a/yara-x-fmt/src/testdata/test29.unformatted → fmt/src/testdata/test29.unformatted b/yara-x-fmt/src/testdata/test29.unformatted → fmt/src/testdata/test29.unformatted
diff --git a/yara-x-fmt/src/testdata/test3.formatted → fmt/src/testdata/test3.formatted b/yara-x-fmt/src/testdata/test3.formatted → fmt/src/testdata/test3.formatted
diff --git a/yara-x-fmt/src/testdata/test3.unformatted → fmt/src/testdata/test3.unformatted b/yara-x-fmt/src/testdata/test3.unformatted → fmt/src/testdata/test3.unformatted
diff --git a/yara-x-fmt/src/testdata/test4.formatted → fmt/src/testdata/test4.formatted b/yara-x-fmt/src/testdata/test4.formatted → fmt/src/testdata/test4.formatted
diff --git a/yara-x-fmt/src/testdata/test4.unformatted → fmt/src/testdata/test4.unformatted b/yara-x-fmt/src/testdata/test4.unformatted → fmt/src/testdata/test4.unformatted
diff --git a/yara-x-fmt/src/testdata/test5.formatted → fmt/src/testdata/test5.formatted b/yara-x-fmt/src/testdata/test5.formatted → fmt/src/testdata/test5.formatted
diff --git a/yara-x-fmt/src/testdata/test5.unformatted → fmt/src/testdata/test5.unformatted b/yara-x-fmt/src/testdata/test5.unformatted → fmt/src/testdata/test5.unformatted
diff --git a/yara-x-fmt/src/testdata/test6.formatted → fmt/src/testdata/test6.formatted b/yara-x-fmt/src/testdata/test6.formatted → fmt/src/testdata/test6.formatted
diff --git a/yara-x-fmt/src/testdata/test6.unformatted → fmt/src/testdata/test6.unformatted b/yara-x-fmt/src/testdata/test6.unformatted → fmt/src/testdata/test6.unformatted
diff --git a/yara-x-fmt/src/testdata/test7.formatted → fmt/src/testdata/test7.formatted b/yara-x-fmt/src/testdata/test7.formatted → fmt/src/testdata/test7.formatted
diff --git a/yara-x-fmt/src/testdata/test7.unformatted → fmt/src/testdata/test7.unformatted b/yara-x-fmt/src/testdata/test7.unformatted → fmt/src/testdata/test7.unformatted
diff --git a/yara-x-fmt/src/testdata/test8.formatted → fmt/src/testdata/test8.formatted b/yara-x-fmt/src/testdata/test8.formatted → fmt/src/testdata/test8.formatted
diff --git a/yara-x-fmt/src/testdata/test8.unformatted → fmt/src/testdata/test8.unformatted b/yara-x-fmt/src/testdata/test8.unformatted → fmt/src/testdata/test8.unformatted
diff --git a/yara-x-fmt/src/testdata/test9.formatted → fmt/src/testdata/test9.formatted b/yara-x-fmt/src/testdata/test9.formatted → fmt/src/testdata/test9.formatted
diff --git a/yara-x-fmt/src/testdata/test9.unformatted → fmt/src/testdata/test9.unformatted b/yara-x-fmt/src/testdata/test9.unformatted → fmt/src/testdata/test9.unformatted
diff --git a/yara-x-fmt/src/tests.rs → fmt/src/tests.rs b/yara-x-fmt/src/tests.rs → fmt/src/tests.rs
diff --git a/yara-x-fmt/src/tokens/mod.rs → fmt/src/tokens/mod.rs b/yara-x-fmt/src/tokens/mod.rs → fmt/src/tokens/mod.rs
diff --git a/yara-x-fmt/src/tokens/tests.rs → fmt/src/tokens/tests.rs b/yara-x-fmt/src/tokens/tests.rs → fmt/src/tokens/tests.rs
diff --git a/yara-x-fmt/src/trailing_spaces.rs → fmt/src/trailing_spaces.rs b/yara-x-fmt/src/trailing_spaces.rs → fmt/src/trailing_spaces.rs
diff --git a/yara-x/Cargo.toml → lib/Cargo.toml b/yara-x/Cargo.toml → lib/Cargo.toml
diff --git a/yara-x/benches/benches.rs → lib/benches/benches.rs b/yara-x/benches/benches.rs → lib/benches/benches.rs
diff --git a/yara-x/build.rs → lib/build.rs b/yara-x/build.rs → lib/build.rs
@@ -20,15 +20,15 @@ fn main() {
         .pure()
         .cargo_out_dir("protos")
         //.out_dir("src/modules/protos")
-        .include("../yara-x-proto/src")
-        .include("../yara-x-proto-yaml/src")
+        .include("../proto/src")
+        .include("../proto-yaml/src")
         .include("src/modules/protos")
-        .input("../yara-x-proto/src/yara.proto")
-        .input("../yara-x-proto-yaml/src/yaml.proto");
+        .input("../proto/src/yara.proto")
+        .input("../proto-yaml/src/yaml.proto");
 
     proto_parser
-        .include("../yara-x-proto/src")
-        .include("../yara-x-proto-yaml/src")
+        .include("../proto/src")
+        .include("../proto-yaml/src")
         .include("src/modules/protos");
 
     for entry in fs::read_dir("src/modules/protos").unwrap() {

diff --git a/yara-x/fuzz/.gitignore → lib/fuzz/.gitignore b/yara-x/fuzz/.gitignore → lib/fuzz/.gitignore
diff --git a/yara-x/fuzz/Cargo.lock → lib/fuzz/Cargo.lock b/yara-x/fuzz/Cargo.lock → lib/fuzz/Cargo.lock
diff --git a/yara-x/fuzz/Cargo.toml → lib/fuzz/Cargo.toml b/yara-x/fuzz/Cargo.toml → lib/fuzz/Cargo.toml
diff --git a/yara-x/fuzz/fuzz_targets/dotnet_parser.rs → lib/fuzz/fuzz_targets/dotnet_parser.rs b/yara-x/fuzz/fuzz_targets/dotnet_parser.rs → lib/fuzz/fuzz_targets/dotnet_parser.rs
diff --git a/yara-x/fuzz/fuzz_targets/elf_parser.rs → lib/fuzz/fuzz_targets/elf_parser.rs b/yara-x/fuzz/fuzz_targets/elf_parser.rs → lib/fuzz/fuzz_targets/elf_parser.rs
diff --git a/yara-x/fuzz/fuzz_targets/lnk_parser.rs → lib/fuzz/fuzz_targets/lnk_parser.rs b/yara-x/fuzz/fuzz_targets/lnk_parser.rs → lib/fuzz/fuzz_targets/lnk_parser.rs
diff --git a/yara-x/fuzz/fuzz_targets/macho_fat_parser.rs → lib/fuzz/fuzz_targets/macho_fat_parser.rs b/yara-x/fuzz/fuzz_targets/macho_fat_parser.rs → lib/fuzz/fuzz_targets/macho_fat_parser.rs
diff --git a/yara-x/fuzz/fuzz_targets/macho_parser.rs → lib/fuzz/fuzz_targets/macho_parser.rs b/yara-x/fuzz/fuzz_targets/macho_parser.rs → lib/fuzz/fuzz_targets/macho_parser.rs
diff --git a/yara-x/fuzz/fuzz_targets/pe_parser.rs → lib/fuzz/fuzz_targets/pe_parser.rs b/yara-x/fuzz/fuzz_targets/pe_parser.rs → lib/fuzz/fuzz_targets/pe_parser.rs
diff --git a/yara-x/fuzz/fuzz_targets/rule_compiler.rs → lib/fuzz/fuzz_targets/rule_compiler.rs b/yara-x/fuzz/fuzz_targets/rule_compiler.rs → lib/fuzz/fuzz_targets/rule_compiler.rs
diff --git a/yara-x/src/compiler/atoms/mask.rs → lib/src/compiler/atoms/mask.rs b/yara-x/src/compiler/atoms/mask.rs → lib/src/compiler/atoms/mask.rs
diff --git a/yara-x/src/compiler/atoms/mod.rs → lib/src/compiler/atoms/mod.rs b/yara-x/src/compiler/atoms/mod.rs → lib/src/compiler/atoms/mod.rs
diff --git a/yara-x/src/compiler/atoms/quality.rs → lib/src/compiler/atoms/quality.rs b/yara-x/src/compiler/atoms/quality.rs → lib/src/compiler/atoms/quality.rs
diff --git a/yara-x/src/compiler/base64.rs → lib/src/compiler/base64.rs b/yara-x/src/compiler/base64.rs → lib/src/compiler/base64.rs
diff --git a/yara-x/src/compiler/context.rs → lib/src/compiler/context.rs b/yara-x/src/compiler/context.rs → lib/src/compiler/context.rs
diff --git a/yara-x/src/compiler/emit.rs → lib/src/compiler/emit.rs b/yara-x/src/compiler/emit.rs → lib/src/compiler/emit.rs
diff --git a/yara-x/src/compiler/errors.rs → lib/src/compiler/errors.rs b/yara-x/src/compiler/errors.rs → lib/src/compiler/errors.rs
diff --git a/yara-x/src/compiler/ir/ast2ir.rs → lib/src/compiler/ir/ast2ir.rs b/yara-x/src/compiler/ir/ast2ir.rs → lib/src/compiler/ir/ast2ir.rs
diff --git a/yara-x/src/compiler/ir/hex2hir.rs → lib/src/compiler/ir/hex2hir.rs b/yara-x/src/compiler/ir/hex2hir.rs → lib/src/compiler/ir/hex2hir.rs
diff --git a/yara-x/src/compiler/ir/mod.rs → lib/src/compiler/ir/mod.rs b/yara-x/src/compiler/ir/mod.rs → lib/src/compiler/ir/mod.rs
diff --git a/yara-x/src/compiler/ir/utils.rs → lib/src/compiler/ir/utils.rs b/yara-x/src/compiler/ir/utils.rs → lib/src/compiler/ir/utils.rs
diff --git a/yara-x/src/compiler/mod.rs → lib/src/compiler/mod.rs b/yara-x/src/compiler/mod.rs → lib/src/compiler/mod.rs
diff --git a/yara-x/src/compiler/rules.rs → lib/src/compiler/rules.rs b/yara-x/src/compiler/rules.rs → lib/src/compiler/rules.rs
diff --git a/yara-x/src/compiler/tests/errors.rs → lib/src/compiler/tests/errors.rs b/yara-x/src/compiler/tests/errors.rs → lib/src/compiler/tests/errors.rs
diff --git a/yara-x/src/compiler/tests/mod.rs → lib/src/compiler/tests/mod.rs b/yara-x/src/compiler/tests/mod.rs → lib/src/compiler/tests/mod.rs
diff --git a/yara-x/src/compiler/tests/warnings.rs → lib/src/compiler/tests/warnings.rs b/yara-x/src/compiler/tests/warnings.rs → lib/src/compiler/tests/warnings.rs
diff --git a/yara-x/src/lib.rs → lib/src/lib.rs b/yara-x/src/lib.rs → lib/src/lib.rs
diff --git a/yara-x/src/modules/console.rs → lib/src/modules/console.rs b/yara-x/src/modules/console.rs → lib/src/modules/console.rs
diff --git a/yara-x/src/modules/dotnet/mod.rs → lib/src/modules/dotnet/mod.rs b/yara-x/src/modules/dotnet/mod.rs → lib/src/modules/dotnet/mod.rs
diff --git a/yara-x/src/modules/dotnet/parser.rs → lib/src/modules/dotnet/parser.rs b/yara-x/src/modules/dotnet/parser.rs → lib/src/modules/dotnet/parser.rs
diff --git a/...3152020fc7964243fc845cad499d11f9ab.in.zip → ...3152020fc7964243fc845cad499d11f9ab.in.zip b/...3152020fc7964243fc845cad499d11f9ab.in.zip → ...3152020fc7964243fc845cad499d11f9ab.in.zip
diff --git a/...a0e3152020fc7964243fc845cad499d11f9ab.out → ...a0e3152020fc7964243fc845cad499d11f9ab.out b/...a0e3152020fc7964243fc845cad499d11f9ab.out → ...a0e3152020fc7964243fc845cad499d11f9ab.out
diff --git a/...85a2f69fe1b94f3a83cfbba4e4104c2b26.in.zip → ...85a2f69fe1b94f3a83cfbba4e4104c2b26.in.zip b/...85a2f69fe1b94f3a83cfbba4e4104c2b26.in.zip → ...85a2f69fe1b94f3a83cfbba4e4104c2b26.in.zip
diff --git a/...07985a2f69fe1b94f3a83cfbba4e4104c2b26.out → ...07985a2f69fe1b94f3a83cfbba4e4104c2b26.out b/...07985a2f69fe1b94f3a83cfbba4e4104c2b26.out → ...07985a2f69fe1b94f3a83cfbba4e4104c2b26.out
diff --git a/...2bd542e5cb948d1a4ea5a575a14d6b9d6ee849.in → ...2bd542e5cb948d1a4ea5a575a14d6b9d6ee849.in b/...2bd542e5cb948d1a4ea5a575a14d6b9d6ee849.in → ...2bd542e5cb948d1a4ea5a575a14d6b9d6ee849.in
diff --git a/...42e5cb948d1a4ea5a575a14d6b9d6ee849.in.zip → ...42e5cb948d1a4ea5a575a14d6b9d6ee849.in.zip b/...42e5cb948d1a4ea5a575a14d6b9d6ee849.in.zip → ...42e5cb948d1a4ea5a575a14d6b9d6ee849.in.zip
diff --git a/...bd542e5cb948d1a4ea5a575a14d6b9d6ee849.out → ...bd542e5cb948d1a4ea5a575a14d6b9d6ee849.out b/...bd542e5cb948d1a4ea5a575a14d6b9d6ee849.out → ...bd542e5cb948d1a4ea5a575a14d6b9d6ee849.out
diff --git a/...62d286de5493c25c000a00f5fbc6e7b746.in.zip → ...62d286de5493c25c000a00f5fbc6e7b746.in.zip b/...62d286de5493c25c000a00f5fbc6e7b746.in.zip → ...62d286de5493c25c000a00f5fbc6e7b746.in.zip
diff --git a/...30a62d286de5493c25c000a00f5fbc6e7b746.out → ...30a62d286de5493c25c000a00f5fbc6e7b746.out b/...30a62d286de5493c25c000a00f5fbc6e7b746.out → ...30a62d286de5493c25c000a00f5fbc6e7b746.out
diff --git a/...358c1068950f849c612ab808225b359db0bb8c.in → ...358c1068950f849c612ab808225b359db0bb8c.in b/...358c1068950f849c612ab808225b359db0bb8c.in → ...358c1068950f849c612ab808225b359db0bb8c.in
diff --git a/...1068950f849c612ab808225b359db0bb8c.in.zip → ...1068950f849c612ab808225b359db0bb8c.in.zip b/...1068950f849c612ab808225b359db0bb8c.in.zip → ...1068950f849c612ab808225b359db0bb8c.in.zip
diff --git a/...58c1068950f849c612ab808225b359db0bb8c.out → ...58c1068950f849c612ab808225b359db0bb8c.out b/...58c1068950f849c612ab808225b359db0bb8c.out → ...58c1068950f849c612ab808225b359db0bb8c.out
diff --git a/...98d03e054ca2b88ef5a41f72b5787841b3.in.zip → ...98d03e054ca2b88ef5a41f72b5787841b3.in.zip b/...98d03e054ca2b88ef5a41f72b5787841b3.in.zip → ...98d03e054ca2b88ef5a41f72b5787841b3.in.zip
diff --git a/...40e98d03e054ca2b88ef5a41f72b5787841b3.out → ...40e98d03e054ca2b88ef5a41f72b5787841b3.out b/...40e98d03e054ca2b88ef5a41f72b5787841b3.out → ...40e98d03e054ca2b88ef5a41f72b5787841b3.out
diff --git a/...92af954dad65df534bff603b9afcb49cd4.in.zip → ...92af954dad65df534bff603b9afcb49cd4.in.zip b/...92af954dad65df534bff603b9afcb49cd4.in.zip → ...92af954dad65df534bff603b9afcb49cd4.in.zip
diff --git a/...f2092af954dad65df534bff603b9afcb49cd4.out → ...f2092af954dad65df534bff603b9afcb49cd4.out b/...f2092af954dad65df534bff603b9afcb49cd4.out → ...f2092af954dad65df534bff603b9afcb49cd4.out
diff --git a/yara-x/src/modules/elf/mod.rs → lib/src/modules/elf/mod.rs b/yara-x/src/modules/elf/mod.rs → lib/src/modules/elf/mod.rs
diff --git a/yara-x/src/modules/elf/parser.rs → lib/src/modules/elf/parser.rs b/yara-x/src/modules/elf/parser.rs → lib/src/modules/elf/parser.rs
diff --git a/yara-x/src/modules/elf/tests/mod.rs → lib/src/modules/elf/tests/mod.rs b/yara-x/src/modules/elf/tests/mod.rs → lib/src/modules/elf/tests/mod.rs
diff --git a/...2ee6f0d961abc71fbe105f69f23b54bcd3.in.zip → ...2ee6f0d961abc71fbe105f69f23b54bcd3.in.zip b/...2ee6f0d961abc71fbe105f69f23b54bcd3.in.zip → ...2ee6f0d961abc71fbe105f69f23b54bcd3.in.zip
diff --git a/...bbc2ee6f0d961abc71fbe105f69f23b54bcd3.out → ...bbc2ee6f0d961abc71fbe105f69f23b54bcd3.out b/...bbc2ee6f0d961abc71fbe105f69f23b54bcd3.out → ...bbc2ee6f0d961abc71fbe105f69f23b54bcd3.out
diff --git a/...6034e6f717bac38b1574bc00408c3a90ca.in.zip → ...6034e6f717bac38b1574bc00408c3a90ca.in.zip b/...6034e6f717bac38b1574bc00408c3a90ca.in.zip → ...6034e6f717bac38b1574bc00408c3a90ca.in.zip
diff --git a/...a5c6034e6f717bac38b1574bc00408c3a90ca.out → ...a5c6034e6f717bac38b1574bc00408c3a90ca.out b/...a5c6034e6f717bac38b1574bc00408c3a90ca.out → ...a5c6034e6f717bac38b1574bc00408c3a90ca.out
diff --git a/...93818264222518c11107aae7d586fabd9e.in.zip → ...93818264222518c11107aae7d586fabd9e.in.zip b/...93818264222518c11107aae7d586fabd9e.in.zip → ...93818264222518c11107aae7d586fabd9e.in.zip
diff --git a/...b8c93818264222518c11107aae7d586fabd9e.out → ...b8c93818264222518c11107aae7d586fabd9e.out b/...b8c93818264222518c11107aae7d586fabd9e.out → ...b8c93818264222518c11107aae7d586fabd9e.out
diff --git a/...527947c0c10a5d9632084a3dee1e828fa7.in.zip → ...527947c0c10a5d9632084a3dee1e828fa7.in.zip b/...527947c0c10a5d9632084a3dee1e828fa7.in.zip → ...527947c0c10a5d9632084a3dee1e828fa7.in.zip
diff --git a/...617527947c0c10a5d9632084a3dee1e828fa7.out → ...617527947c0c10a5d9632084a3dee1e828fa7.out b/...617527947c0c10a5d9632084a3dee1e828fa7.out → ...617527947c0c10a5d9632084a3dee1e828fa7.out
diff --git a/...0425aa892e4b358bf5a9bf4304e571df1b.in.zip → ...0425aa892e4b358bf5a9bf4304e571df1b.in.zip b/...0425aa892e4b358bf5a9bf4304e571df1b.in.zip → ...0425aa892e4b358bf5a9bf4304e571df1b.in.zip
diff --git a/...00a0425aa892e4b358bf5a9bf4304e571df1b.out → ...00a0425aa892e4b358bf5a9bf4304e571df1b.out b/...00a0425aa892e4b358bf5a9bf4304e571df1b.out → ...00a0425aa892e4b358bf5a9bf4304e571df1b.out
diff --git a/...e4e1d3a026356da4043095f9b96ebce51c.in.zip → ...e4e1d3a026356da4043095f9b96ebce51c.in.zip b/...e4e1d3a026356da4043095f9b96ebce51c.in.zip → ...e4e1d3a026356da4043095f9b96ebce51c.in.zip
diff --git a/...b51e4e1d3a026356da4043095f9b96ebce51c.out → ...b51e4e1d3a026356da4043095f9b96ebce51c.out b/...b51e4e1d3a026356da4043095f9b96ebce51c.out → ...b51e4e1d3a026356da4043095f9b96ebce51c.out
diff --git a/...a294f58042436d30b5f5126c16edbdc1a7.in.zip → ...a294f58042436d30b5f5126c16edbdc1a7.in.zip b/...a294f58042436d30b5f5126c16edbdc1a7.in.zip → ...a294f58042436d30b5f5126c16edbdc1a7.in.zip
diff --git a/...e23a294f58042436d30b5f5126c16edbdc1a7.out → ...e23a294f58042436d30b5f5126c16edbdc1a7.out b/...e23a294f58042436d30b5f5126c16edbdc1a7.out → ...e23a294f58042436d30b5f5126c16edbdc1a7.out
diff --git a/...e5d157c0628f5a348e64f63962265d1434.in.zip → ...e5d157c0628f5a348e64f63962265d1434.in.zip b/...e5d157c0628f5a348e64f63962265d1434.in.zip → ...e5d157c0628f5a348e64f63962265d1434.in.zip
diff --git a/...b03e5d157c0628f5a348e64f63962265d1434.out → ...b03e5d157c0628f5a348e64f63962265d1434.out b/...b03e5d157c0628f5a348e64f63962265d1434.out → ...b03e5d157c0628f5a348e64f63962265d1434.out
diff --git a/...c599ca4fb159be50ef740b31a32dfbcf67.in.zip → ...c599ca4fb159be50ef740b31a32dfbcf67.in.zip b/...c599ca4fb159be50ef740b31a32dfbcf67.in.zip → ...c599ca4fb159be50ef740b31a32dfbcf67.in.zip
diff --git a/...d5dc599ca4fb159be50ef740b31a32dfbcf67.out → ...d5dc599ca4fb159be50ef740b31a32dfbcf67.out b/...d5dc599ca4fb159be50ef740b31a32dfbcf67.out → ...d5dc599ca4fb159be50ef740b31a32dfbcf67.out
diff --git a/yara-x/src/modules/hash/mod.rs → lib/src/modules/hash/mod.rs b/yara-x/src/modules/hash/mod.rs → lib/src/modules/hash/mod.rs
diff --git a/yara-x/src/modules/hash/tests/mod.rs → lib/src/modules/hash/tests/mod.rs b/yara-x/src/modules/hash/tests/mod.rs → lib/src/modules/hash/tests/mod.rs
diff --git a/yara-x/src/modules/lnk/mod.rs → lib/src/modules/lnk/mod.rs b/yara-x/src/modules/lnk/mod.rs → lib/src/modules/lnk/mod.rs
diff --git a/yara-x/src/modules/lnk/parser.rs → lib/src/modules/lnk/parser.rs b/yara-x/src/modules/lnk/parser.rs → lib/src/modules/lnk/parser.rs
diff --git a/...lnk/tests/testdata/lnk-extradata-1.in.zip → ...lnk/tests/testdata/lnk-extradata-1.in.zip b/...lnk/tests/testdata/lnk-extradata-1.in.zip → ...lnk/tests/testdata/lnk-extradata-1.in.zip
diff --git a/...es/lnk/tests/testdata/lnk-extradata-1.out → ...es/lnk/tests/testdata/lnk-extradata-1.out b/...es/lnk/tests/testdata/lnk-extradata-1.out → ...es/lnk/tests/testdata/lnk-extradata-1.out
diff --git a/...lnk/tests/testdata/lnk-extradata-2.in.zip → ...lnk/tests/testdata/lnk-extradata-2.in.zip b/...lnk/tests/testdata/lnk-extradata-2.in.zip → ...lnk/tests/testdata/lnk-extradata-2.in.zip
diff --git a/...es/lnk/tests/testdata/lnk-extradata-2.out → ...es/lnk/tests/testdata/lnk-extradata-2.out b/...es/lnk/tests/testdata/lnk-extradata-2.out → ...es/lnk/tests/testdata/lnk-extradata-2.out
diff --git a/...s/lnk/tests/testdata/lnk-malformed.in.zip → ...s/lnk/tests/testdata/lnk-malformed.in.zip b/...s/lnk/tests/testdata/lnk-malformed.in.zip → ...s/lnk/tests/testdata/lnk-malformed.in.zip
diff --git a/...ules/lnk/tests/testdata/lnk-malformed.out → ...ules/lnk/tests/testdata/lnk-malformed.out b/...ules/lnk/tests/testdata/lnk-malformed.out → ...ules/lnk/tests/testdata/lnk-malformed.out
diff --git a/...les/lnk/tests/testdata/lnk-network.in.zip → ...les/lnk/tests/testdata/lnk-network.in.zip b/...les/lnk/tests/testdata/lnk-network.in.zip → ...les/lnk/tests/testdata/lnk-network.in.zip
diff --git a/...odules/lnk/tests/testdata/lnk-network.out → ...odules/lnk/tests/testdata/lnk-network.out b/...odules/lnk/tests/testdata/lnk-network.out → ...odules/lnk/tests/testdata/lnk-network.out
diff --git a/...les/lnk/tests/testdata/lnk-overlay.in.zip → ...les/lnk/tests/testdata/lnk-overlay.in.zip b/...les/lnk/tests/testdata/lnk-overlay.in.zip → ...les/lnk/tests/testdata/lnk-overlay.in.zip
diff --git a/...odules/lnk/tests/testdata/lnk-overlay.out → ...odules/lnk/tests/testdata/lnk-overlay.out b/...odules/lnk/tests/testdata/lnk-overlay.out → ...odules/lnk/tests/testdata/lnk-overlay.out
diff --git a/...es/lnk/tests/testdata/lnk-standard.in.zip → ...es/lnk/tests/testdata/lnk-standard.in.zip b/...es/lnk/tests/testdata/lnk-standard.in.zip → ...es/lnk/tests/testdata/lnk-standard.in.zip
diff --git a/...dules/lnk/tests/testdata/lnk-standard.out → ...dules/lnk/tests/testdata/lnk-standard.out b/...dules/lnk/tests/testdata/lnk-standard.out → ...dules/lnk/tests/testdata/lnk-standard.out
diff --git a/yara-x/src/modules/macho/mod.rs → lib/src/modules/macho/mod.rs b/yara-x/src/modules/macho/mod.rs → lib/src/modules/macho/mod.rs
diff --git a/yara-x/src/modules/macho/parser.rs → lib/src/modules/macho/parser.rs b/yara-x/src/modules/macho/parser.rs → lib/src/modules/macho/parser.rs
diff --git a/yara-x/src/modules/macho/tests/mod.rs → lib/src/modules/macho/tests/mod.rs b/yara-x/src/modules/macho/tests/mod.rs → lib/src/modules/macho/tests/mod.rs
diff --git a/...ae4d21de61f776e2405324c498ef52b21b.in.zip → ...ae4d21de61f776e2405324c498ef52b21b.in.zip b/...ae4d21de61f776e2405324c498ef52b21b.in.zip → ...ae4d21de61f776e2405324c498ef52b21b.in.zip
diff --git a/...bfaae4d21de61f776e2405324c498ef52b21b.out → ...bfaae4d21de61f776e2405324c498ef52b21b.out b/...bfaae4d21de61f776e2405324c498ef52b21b.out → ...bfaae4d21de61f776e2405324c498ef52b21b.out
diff --git a/...fb2bb8114803e8b26c0652ce4afccb94e1.in.zip → ...fb2bb8114803e8b26c0652ce4afccb94e1.in.zip b/...fb2bb8114803e8b26c0652ce4afccb94e1.in.zip → ...fb2bb8114803e8b26c0652ce4afccb94e1.in.zip
diff --git a/...6dafb2bb8114803e8b26c0652ce4afccb94e1.out → ...6dafb2bb8114803e8b26c0652ce4afccb94e1.out b/...6dafb2bb8114803e8b26c0652ce4afccb94e1.out → ...6dafb2bb8114803e8b26c0652ce4afccb94e1.out
diff --git a/...00bae94f868ce65a3352177dd6a75797ff.in.zip → ...00bae94f868ce65a3352177dd6a75797ff.in.zip b/...00bae94f868ce65a3352177dd6a75797ff.in.zip → ...00bae94f868ce65a3352177dd6a75797ff.in.zip
diff --git a/...53a00bae94f868ce65a3352177dd6a75797ff.out → ...53a00bae94f868ce65a3352177dd6a75797ff.out b/...53a00bae94f868ce65a3352177dd6a75797ff.out → ...53a00bae94f868ce65a3352177dd6a75797ff.out
diff --git a/...394e400276ef05b93daa78717daffcd803.in.zip → ...394e400276ef05b93daa78717daffcd803.in.zip b/...394e400276ef05b93daa78717daffcd803.in.zip → ...394e400276ef05b93daa78717daffcd803.in.zip
diff --git a/...9fa394e400276ef05b93daa78717daffcd803.out → ...9fa394e400276ef05b93daa78717daffcd803.out b/...9fa394e400276ef05b93daa78717daffcd803.out → ...9fa394e400276ef05b93daa78717daffcd803.out
diff --git a/...c8beebeb768e712bd3b754b5cd3e151356.in.zip → ...c8beebeb768e712bd3b754b5cd3e151356.in.zip b/...c8beebeb768e712bd3b754b5cd3e151356.in.zip → ...c8beebeb768e712bd3b754b5cd3e151356.in.zip
diff --git a/...543c8beebeb768e712bd3b754b5cd3e151356.out → ...543c8beebeb768e712bd3b754b5cd3e151356.out b/...543c8beebeb768e712bd3b754b5cd3e151356.out → ...543c8beebeb768e712bd3b754b5cd3e151356.out
diff --git a/...b8cd171119a7bf7a329ae18e5b34cdb85f.in.zip → ...b8cd171119a7bf7a329ae18e5b34cdb85f.in.zip b/...b8cd171119a7bf7a329ae18e5b34cdb85f.in.zip → ...b8cd171119a7bf7a329ae18e5b34cdb85f.in.zip
diff --git a/...22cb8cd171119a7bf7a329ae18e5b34cdb85f.out → ...22cb8cd171119a7bf7a329ae18e5b34cdb85f.out b/...22cb8cd171119a7bf7a329ae18e5b34cdb85f.out → ...22cb8cd171119a7bf7a329ae18e5b34cdb85f.out
diff --git a/...9cb0e7394c7b5065f74b7ce8c52ace75f1.in.zip → ...9cb0e7394c7b5065f74b7ce8c52ace75f1.in.zip b/...9cb0e7394c7b5065f74b7ce8c52ace75f1.in.zip → ...9cb0e7394c7b5065f74b7ce8c52ace75f1.in.zip
diff --git a/...8d79cb0e7394c7b5065f74b7ce8c52ace75f1.out → ...8d79cb0e7394c7b5065f74b7ce8c52ace75f1.out b/...8d79cb0e7394c7b5065f74b7ce8c52ace75f1.out → ...8d79cb0e7394c7b5065f74b7ce8c52ace75f1.out
diff --git a/...a5bf085619bbde2c4146b0cc00ebad21c8.in.zip → ...a5bf085619bbde2c4146b0cc00ebad21c8.in.zip b/...a5bf085619bbde2c4146b0cc00ebad21c8.in.zip → ...a5bf085619bbde2c4146b0cc00ebad21c8.in.zip
diff --git a/...329a5bf085619bbde2c4146b0cc00ebad21c8.out → ...329a5bf085619bbde2c4146b0cc00ebad21c8.out b/...329a5bf085619bbde2c4146b0cc00ebad21c8.out → ...329a5bf085619bbde2c4146b0cc00ebad21c8.out
diff --git a/...acho/tests/testdata/macho_ppc_file.in.zip → ...acho/tests/testdata/macho_ppc_file.in.zip b/...acho/tests/testdata/macho_ppc_file.in.zip → ...acho/tests/testdata/macho_ppc_file.in.zip
diff --git a/...s/macho/tests/testdata/macho_ppc_file.out → ...s/macho/tests/testdata/macho_ppc_file.out b/...s/macho/tests/testdata/macho_ppc_file.out → ...s/macho/tests/testdata/macho_ppc_file.out
diff --git a/...s/testdata/macho_x86_64_dylib_file.in.zip → ...s/testdata/macho_x86_64_dylib_file.in.zip b/...s/testdata/macho_x86_64_dylib_file.in.zip → ...s/testdata/macho_x86_64_dylib_file.in.zip
diff --git a/...ests/testdata/macho_x86_64_dylib_file.out → ...ests/testdata/macho_x86_64_dylib_file.out b/...ests/testdata/macho_x86_64_dylib_file.out → ...ests/testdata/macho_x86_64_dylib_file.out
diff --git a/...acho/tests/testdata/macho_x86_file.in.zip → ...acho/tests/testdata/macho_x86_file.in.zip b/...acho/tests/testdata/macho_x86_file.in.zip → ...acho/tests/testdata/macho_x86_file.in.zip
diff --git a/...s/macho/tests/testdata/macho_x86_file.out → ...s/macho/tests/testdata/macho_x86_file.out b/...s/macho/tests/testdata/macho_x86_file.out → ...s/macho/tests/testdata/macho_x86_file.out
diff --git a/...sts/testdata/macho_x86_object_file.in.zip → ...sts/testdata/macho_x86_object_file.in.zip b/...sts/testdata/macho_x86_object_file.in.zip → ...sts/testdata/macho_x86_object_file.in.zip
diff --git a/.../tests/testdata/macho_x86_object_file.out → .../tests/testdata/macho_x86_object_file.out b/.../tests/testdata/macho_x86_object_file.out → .../tests/testdata/macho_x86_object_file.out
diff --git a/...es/macho/tests/testdata/tiny_macho.in.zip → ...es/macho/tests/testdata/tiny_macho.in.zip b/...es/macho/tests/testdata/tiny_macho.in.zip → ...es/macho/tests/testdata/tiny_macho.in.zip
diff --git a/...dules/macho/tests/testdata/tiny_macho.out → ...dules/macho/tests/testdata/tiny_macho.out b/...dules/macho/tests/testdata/tiny_macho.out → ...dules/macho/tests/testdata/tiny_macho.out
diff --git a/...acho/tests/testdata/tiny_universal.in.zip → ...acho/tests/testdata/tiny_universal.in.zip b/...acho/tests/testdata/tiny_universal.in.zip → ...acho/tests/testdata/tiny_universal.in.zip
diff --git a/...s/macho/tests/testdata/tiny_universal.out → ...s/macho/tests/testdata/tiny_universal.out b/...s/macho/tests/testdata/tiny_universal.out → ...s/macho/tests/testdata/tiny_universal.out
diff --git a/yara-x/src/modules/math.rs → lib/src/modules/math.rs b/yara-x/src/modules/math.rs → lib/src/modules/math.rs
diff --git a/yara-x/src/modules/mod.rs → lib/src/modules/mod.rs b/yara-x/src/modules/mod.rs → lib/src/modules/mod.rs
diff --git a/yara-x/src/modules/modules.rs → lib/src/modules/modules.rs b/yara-x/src/modules/modules.rs → lib/src/modules/modules.rs
diff --git a/yara-x/src/modules/pe/mod.rs → lib/src/modules/pe/mod.rs b/yara-x/src/modules/pe/mod.rs → lib/src/modules/pe/mod.rs
diff --git a/yara-x/src/modules/pe/parser.rs → lib/src/modules/pe/parser.rs b/yara-x/src/modules/pe/parser.rs → lib/src/modules/pe/parser.rs
diff --git a/yara-x/src/modules/pe/rva2off.rs → lib/src/modules/pe/rva2off.rs b/yara-x/src/modules/pe/rva2off.rs → lib/src/modules/pe/rva2off.rs
diff --git a/yara-x/src/modules/pe/tests/mod.rs → lib/src/modules/pe/tests/mod.rs b/yara-x/src/modules/pe/tests/mod.rs → lib/src/modules/pe/tests/mod.rs
diff --git a/...7104f54a75683a5adee235401778279818.in.zip → ...7104f54a75683a5adee235401778279818.in.zip b/...7104f54a75683a5adee235401778279818.in.zip → ...7104f54a75683a5adee235401778279818.in.zip
diff --git a/...2597104f54a75683a5adee235401778279818.out → ...2597104f54a75683a5adee235401778279818.out b/...2597104f54a75683a5adee235401778279818.out → ...2597104f54a75683a5adee235401778279818.out
diff --git a/...c8dd28a968c6b4d3b88acdd58ce2d3b885.in.zip → ...c8dd28a968c6b4d3b88acdd58ce2d3b885.in.zip b/...c8dd28a968c6b4d3b88acdd58ce2d3b885.in.zip → ...c8dd28a968c6b4d3b88acdd58ce2d3b885.in.zip
diff --git a/...5cdc8dd28a968c6b4d3b88acdd58ce2d3b885.out → ...5cdc8dd28a968c6b4d3b88acdd58ce2d3b885.out b/...5cdc8dd28a968c6b4d3b88acdd58ce2d3b885.out → ...5cdc8dd28a968c6b4d3b88acdd58ce2d3b885.out
diff --git a/...35267a9b0156642a9596a62e85c9998cc9.in.zip → ...35267a9b0156642a9596a62e85c9998cc9.in.zip b/...35267a9b0156642a9596a62e85c9998cc9.in.zip → ...35267a9b0156642a9596a62e85c9998cc9.in.zip
diff --git a/...a4135267a9b0156642a9596a62e85c9998cc9.out → ...a4135267a9b0156642a9596a62e85c9998cc9.out b/...a4135267a9b0156642a9596a62e85c9998cc9.out → ...a4135267a9b0156642a9596a62e85c9998cc9.out
diff --git a/...cd882c80e5afc511c4f7b2e0e193968f7f.in.zip → ...cd882c80e5afc511c4f7b2e0e193968f7f.in.zip b/...cd882c80e5afc511c4f7b2e0e193968f7f.in.zip → ...cd882c80e5afc511c4f7b2e0e193968f7f.in.zip
diff --git a/...d55cd882c80e5afc511c4f7b2e0e193968f7f.out → ...d55cd882c80e5afc511c4f7b2e0e193968f7f.out b/...d55cd882c80e5afc511c4f7b2e0e193968f7f.out → ...d55cd882c80e5afc511c4f7b2e0e193968f7f.out
diff --git a/...f56b21e48fd67044e69e7a2ae76db631e5.in.zip → ...f56b21e48fd67044e69e7a2ae76db631e5.in.zip b/...f56b21e48fd67044e69e7a2ae76db631e5.in.zip → ...f56b21e48fd67044e69e7a2ae76db631e5.in.zip
diff --git a/...b02f56b21e48fd67044e69e7a2ae76db631e5.out → ...b02f56b21e48fd67044e69e7a2ae76db631e5.out b/...b02f56b21e48fd67044e69e7a2ae76db631e5.out → ...b02f56b21e48fd67044e69e7a2ae76db631e5.out
diff --git a/...dbec84b9d71a6abbacb26c14e83f5897e4.in.zip → ...dbec84b9d71a6abbacb26c14e83f5897e4.in.zip b/...dbec84b9d71a6abbacb26c14e83f5897e4.in.zip → ...dbec84b9d71a6abbacb26c14e83f5897e4.in.zip
diff --git a/...e35dbec84b9d71a6abbacb26c14e83f5897e4.out → ...e35dbec84b9d71a6abbacb26c14e83f5897e4.out b/...e35dbec84b9d71a6abbacb26c14e83f5897e4.out → ...e35dbec84b9d71a6abbacb26c14e83f5897e4.out
diff --git a/...c0fad490cb2165f371f53b61941eedf072.in.zip → ...c0fad490cb2165f371f53b61941eedf072.in.zip b/...c0fad490cb2165f371f53b61941eedf072.in.zip → ...c0fad490cb2165f371f53b61941eedf072.in.zip
diff --git a/...742c0fad490cb2165f371f53b61941eedf072.out → ...742c0fad490cb2165f371f53b61941eedf072.out b/...742c0fad490cb2165f371f53b61941eedf072.out → ...742c0fad490cb2165f371f53b61941eedf072.out
diff --git a/...f272c62d1889216b7a6f1141571ec12649.in.zip → ...f272c62d1889216b7a6f1141571ec12649.in.zip b/...f272c62d1889216b7a6f1141571ec12649.in.zip → ...f272c62d1889216b7a6f1141571ec12649.in.zip
diff --git a/...a19f272c62d1889216b7a6f1141571ec12649.out → ...a19f272c62d1889216b7a6f1141571ec12649.out b/...a19f272c62d1889216b7a6f1141571ec12649.out → ...a19f272c62d1889216b7a6f1141571ec12649.out
diff --git a/...d7f095eb395779de0ad1ac946914dfa34c.in.zip → ...d7f095eb395779de0ad1ac946914dfa34c.in.zip b/...d7f095eb395779de0ad1ac946914dfa34c.in.zip → ...d7f095eb395779de0ad1ac946914dfa34c.in.zip
diff --git a/...c44d7f095eb395779de0ad1ac946914dfa34c.out → ...c44d7f095eb395779de0ad1ac946914dfa34c.out b/...c44d7f095eb395779de0ad1ac946914dfa34c.out → ...c44d7f095eb395779de0ad1ac946914dfa34c.out
diff --git a/...ea184ce9b58320891a2d72d4ec93766f14.in.zip → ...ea184ce9b58320891a2d72d4ec93766f14.in.zip b/...ea184ce9b58320891a2d72d4ec93766f14.in.zip → ...ea184ce9b58320891a2d72d4ec93766f14.in.zip
diff --git a/...dcfea184ce9b58320891a2d72d4ec93766f14.out → ...dcfea184ce9b58320891a2d72d4ec93766f14.out b/...dcfea184ce9b58320891a2d72d4ec93766f14.out → ...dcfea184ce9b58320891a2d72d4ec93766f14.out
diff --git a/...004d49ec0c1806080fa72e960529cba14c.in.zip → ...004d49ec0c1806080fa72e960529cba14c.in.zip b/...004d49ec0c1806080fa72e960529cba14c.in.zip → ...004d49ec0c1806080fa72e960529cba14c.in.zip
diff --git a/...a8f004d49ec0c1806080fa72e960529cba14c.out → ...a8f004d49ec0c1806080fa72e960529cba14c.out b/...a8f004d49ec0c1806080fa72e960529cba14c.out → ...a8f004d49ec0c1806080fa72e960529cba14c.out
diff --git a/...eb69005158f981bc84560e9a5dde103d90.in.zip → ...eb69005158f981bc84560e9a5dde103d90.in.zip b/...eb69005158f981bc84560e9a5dde103d90.in.zip → ...eb69005158f981bc84560e9a5dde103d90.in.zip
diff --git a/...3b0eb69005158f981bc84560e9a5dde103d90.out → ...3b0eb69005158f981bc84560e9a5dde103d90.out b/...3b0eb69005158f981bc84560e9a5dde103d90.out → ...3b0eb69005158f981bc84560e9a5dde103d90.out
diff --git a/...a4181f6477cfb61f2130f37d014ce21888.in.zip → ...a4181f6477cfb61f2130f37d014ce21888.in.zip b/...a4181f6477cfb61f2130f37d014ce21888.in.zip → ...a4181f6477cfb61f2130f37d014ce21888.in.zip
diff --git a/...6dea4181f6477cfb61f2130f37d014ce21888.out → ...6dea4181f6477cfb61f2130f37d014ce21888.out b/...6dea4181f6477cfb61f2130f37d014ce21888.out → ...6dea4181f6477cfb61f2130f37d014ce21888.out
diff --git a/...2ccfb04ccedd3ada1e8c26939c726a4c8e.in.zip → ...2ccfb04ccedd3ada1e8c26939c726a4c8e.in.zip b/...2ccfb04ccedd3ada1e8c26939c726a4c8e.in.zip → ...2ccfb04ccedd3ada1e8c26939c726a4c8e.in.zip
diff --git a/...ad42ccfb04ccedd3ada1e8c26939c726a4c8e.out → ...ad42ccfb04ccedd3ada1e8c26939c726a4c8e.out b/...ad42ccfb04ccedd3ada1e8c26939c726a4c8e.out → ...ad42ccfb04ccedd3ada1e8c26939c726a4c8e.out
diff --git a/...b966dbf9e198c94e3d74a9e9260e5f9870.in.zip → ...b966dbf9e198c94e3d74a9e9260e5f9870.in.zip b/...b966dbf9e198c94e3d74a9e9260e5f9870.in.zip → ...b966dbf9e198c94e3d74a9e9260e5f9870.in.zip
diff --git a/...2eeb966dbf9e198c94e3d74a9e9260e5f9870.out → ...2eeb966dbf9e198c94e3d74a9e9260e5f9870.out b/...2eeb966dbf9e198c94e3d74a9e9260e5f9870.out → ...2eeb966dbf9e198c94e3d74a9e9260e5f9870.out
diff --git a/...bafd719dcc7cfc28f405ad3bc2783c6a12.in.zip → ...bafd719dcc7cfc28f405ad3bc2783c6a12.in.zip b/...bafd719dcc7cfc28f405ad3bc2783c6a12.in.zip → ...bafd719dcc7cfc28f405ad3bc2783c6a12.in.zip
diff --git a/...21bbafd719dcc7cfc28f405ad3bc2783c6a12.out → ...21bbafd719dcc7cfc28f405ad3bc2783c6a12.out b/...21bbafd719dcc7cfc28f405ad3bc2783c6a12.out → ...21bbafd719dcc7cfc28f405ad3bc2783c6a12.out
diff --git a/...85f177fb9daaa2649b4669a24f2ee7e3ba.in.zip → ...85f177fb9daaa2649b4669a24f2ee7e3ba.in.zip b/...85f177fb9daaa2649b4669a24f2ee7e3ba.in.zip → ...85f177fb9daaa2649b4669a24f2ee7e3ba.in.zip
diff --git a/...fe185f177fb9daaa2649b4669a24f2ee7e3ba.out → ...fe185f177fb9daaa2649b4669a24f2ee7e3ba.out b/...fe185f177fb9daaa2649b4669a24f2ee7e3ba.out → ...fe185f177fb9daaa2649b4669a24f2ee7e3ba.out
diff --git a/...0029d9d4e7903cd63291946b334c314831.in.zip → ...0029d9d4e7903cd63291946b334c314831.in.zip b/...0029d9d4e7903cd63291946b334c314831.in.zip → ...0029d9d4e7903cd63291946b334c314831.in.zip
diff --git a/...18a0029d9d4e7903cd63291946b334c314831.out → ...18a0029d9d4e7903cd63291946b334c314831.out b/...18a0029d9d4e7903cd63291946b334c314831.out → ...18a0029d9d4e7903cd63291946b334c314831.out
diff --git a/...73b860e3b4d42e081f86d27bdb1cf6ede4.in.zip → ...73b860e3b4d42e081f86d27bdb1cf6ede4.in.zip b/...73b860e3b4d42e081f86d27bdb1cf6ede4.in.zip → ...73b860e3b4d42e081f86d27bdb1cf6ede4.in.zip
diff --git a/...40073b860e3b4d42e081f86d27bdb1cf6ede4.out → ...40073b860e3b4d42e081f86d27bdb1cf6ede4.out b/...40073b860e3b4d42e081f86d27bdb1cf6ede4.out → ...40073b860e3b4d42e081f86d27bdb1cf6ede4.out
diff --git a/...7d29de9dfc156666c98581dfeccc07548e.in.zip → ...7d29de9dfc156666c98581dfeccc07548e.in.zip b/...7d29de9dfc156666c98581dfeccc07548e.in.zip → ...7d29de9dfc156666c98581dfeccc07548e.in.zip
diff --git a/...0c17d29de9dfc156666c98581dfeccc07548e.out → ...0c17d29de9dfc156666c98581dfeccc07548e.out b/...0c17d29de9dfc156666c98581dfeccc07548e.out → ...0c17d29de9dfc156666c98581dfeccc07548e.out
diff --git a/...e0c9710e5a787b18c6948f2eedd9338984.in.zip → ...e0c9710e5a787b18c6948f2eedd9338984.in.zip b/...e0c9710e5a787b18c6948f2eedd9338984.in.zip → ...e0c9710e5a787b18c6948f2eedd9338984.in.zip
diff --git a/...218e0c9710e5a787b18c6948f2eedd9338984.out → ...218e0c9710e5a787b18c6948f2eedd9338984.out b/...218e0c9710e5a787b18c6948f2eedd9338984.out → ...218e0c9710e5a787b18c6948f2eedd9338984.out
diff --git a/...8fef40dad54532ee4355b86bc129f27345.in.zip → ...8fef40dad54532ee4355b86bc129f27345.in.zip b/...8fef40dad54532ee4355b86bc129f27345.in.zip → ...8fef40dad54532ee4355b86bc129f27345.in.zip
diff --git a/...9258fef40dad54532ee4355b86bc129f27345.out → ...9258fef40dad54532ee4355b86bc129f27345.out b/...9258fef40dad54532ee4355b86bc129f27345.out → ...9258fef40dad54532ee4355b86bc129f27345.out
diff --git a/...8d3920141a39b502e870348ce3b254eb80.in.zip → ...8d3920141a39b502e870348ce3b254eb80.in.zip b/...8d3920141a39b502e870348ce3b254eb80.in.zip → ...8d3920141a39b502e870348ce3b254eb80.in.zip
diff --git a/...13f8d3920141a39b502e870348ce3b254eb80.out → ...13f8d3920141a39b502e870348ce3b254eb80.out b/...13f8d3920141a39b502e870348ce3b254eb80.out → ...13f8d3920141a39b502e870348ce3b254eb80.out
diff --git a/...e0826b06cd15eb6dec9bf3df6465216dd8.in.zip → ...e0826b06cd15eb6dec9bf3df6465216dd8.in.zip b/...e0826b06cd15eb6dec9bf3df6465216dd8.in.zip → ...e0826b06cd15eb6dec9bf3df6465216dd8.in.zip
diff --git a/...c12e0826b06cd15eb6dec9bf3df6465216dd8.out → ...c12e0826b06cd15eb6dec9bf3df6465216dd8.out b/...c12e0826b06cd15eb6dec9bf3df6465216dd8.out → ...c12e0826b06cd15eb6dec9bf3df6465216dd8.out
diff --git a/...73e10a4086fc9d7606fac6e945c0c15ca2.in.zip → ...73e10a4086fc9d7606fac6e945c0c15ca2.in.zip b/...73e10a4086fc9d7606fac6e945c0c15ca2.in.zip → ...73e10a4086fc9d7606fac6e945c0c15ca2.in.zip
diff --git a/...09173e10a4086fc9d7606fac6e945c0c15ca2.out → ...09173e10a4086fc9d7606fac6e945c0c15ca2.out b/...09173e10a4086fc9d7606fac6e945c0c15ca2.out → ...09173e10a4086fc9d7606fac6e945c0c15ca2.out
diff --git a/yara-x/src/modules/protos/console.proto → lib/src/modules/protos/console.proto b/yara-x/src/modules/protos/console.proto → lib/src/modules/protos/console.proto
diff --git a/yara-x/src/modules/protos/dotnet.proto → lib/src/modules/protos/dotnet.proto b/yara-x/src/modules/protos/dotnet.proto → lib/src/modules/protos/dotnet.proto
diff --git a/yara-x/src/modules/protos/elf.proto → lib/src/modules/protos/elf.proto b/yara-x/src/modules/protos/elf.proto → lib/src/modules/protos/elf.proto
diff --git a/yara-x/src/modules/protos/hash.proto → lib/src/modules/protos/hash.proto b/yara-x/src/modules/protos/hash.proto → lib/src/modules/protos/hash.proto
diff --git a/yara-x/src/modules/protos/lnk.proto → lib/src/modules/protos/lnk.proto b/yara-x/src/modules/protos/lnk.proto → lib/src/modules/protos/lnk.proto
diff --git a/yara-x/src/modules/protos/macho.proto → lib/src/modules/protos/macho.proto b/yara-x/src/modules/protos/macho.proto → lib/src/modules/protos/macho.proto
diff --git a/yara-x/src/modules/protos/math.proto → lib/src/modules/protos/math.proto b/yara-x/src/modules/protos/math.proto → lib/src/modules/protos/math.proto
diff --git a/yara-x/src/modules/protos/mods.proto → lib/src/modules/protos/mods.proto b/yara-x/src/modules/protos/mods.proto → lib/src/modules/protos/mods.proto
diff --git a/yara-x/src/modules/protos/pe.proto → lib/src/modules/protos/pe.proto b/yara-x/src/modules/protos/pe.proto → lib/src/modules/protos/pe.proto
diff --git a/yara-x/src/modules/protos/string.proto → lib/src/modules/protos/string.proto b/yara-x/src/modules/protos/string.proto → lib/src/modules/protos/string.proto
diff --git a/yara-x/src/modules/protos/test_proto2.proto → lib/src/modules/protos/test_proto2.proto b/yara-x/src/modules/protos/test_proto2.proto → lib/src/modules/protos/test_proto2.proto
diff --git a/yara-x/src/modules/protos/test_proto3.proto → lib/src/modules/protos/test_proto3.proto b/yara-x/src/modules/protos/test_proto3.proto → lib/src/modules/protos/test_proto3.proto
diff --git a/yara-x/src/modules/protos/text.proto → lib/src/modules/protos/text.proto b/yara-x/src/modules/protos/text.proto → lib/src/modules/protos/text.proto
diff --git a/yara-x/src/modules/protos/time.proto → lib/src/modules/protos/time.proto b/yara-x/src/modules/protos/time.proto → lib/src/modules/protos/time.proto
diff --git a/yara-x/src/modules/string.rs → lib/src/modules/string.rs b/yara-x/src/modules/string.rs → lib/src/modules/string.rs
diff --git a/yara-x/src/modules/test_proto2/mod.rs → lib/src/modules/test_proto2/mod.rs b/yara-x/src/modules/test_proto2/mod.rs → lib/src/modules/test_proto2/mod.rs
diff --git a/yara-x/src/modules/test_proto2/tests/mod.rs → lib/src/modules/test_proto2/tests/mod.rs b/yara-x/src/modules/test_proto2/tests/mod.rs → lib/src/modules/test_proto2/tests/mod.rs
diff --git a/yara-x/src/modules/test_proto3/mod.rs → lib/src/modules/test_proto3/mod.rs b/yara-x/src/modules/test_proto3/mod.rs → lib/src/modules/test_proto3/mod.rs
diff --git a/yara-x/src/modules/tests.rs → lib/src/modules/tests.rs b/yara-x/src/modules/tests.rs → lib/src/modules/tests.rs
diff --git a/yara-x/src/modules/text.rs → lib/src/modules/text.rs b/yara-x/src/modules/text.rs → lib/src/modules/text.rs
diff --git a/yara-x/src/modules/time.rs → lib/src/modules/time.rs b/yara-x/src/modules/time.rs → lib/src/modules/time.rs
diff --git a/yara-x/src/re/bitmapset.rs → lib/src/re/bitmapset.rs b/yara-x/src/re/bitmapset.rs → lib/src/re/bitmapset.rs
diff --git a/yara-x/src/re/fast/compiler.rs → lib/src/re/fast/compiler.rs b/yara-x/src/re/fast/compiler.rs → lib/src/re/fast/compiler.rs
diff --git a/yara-x/src/re/fast/fastvm.rs → lib/src/re/fast/fastvm.rs b/yara-x/src/re/fast/fastvm.rs → lib/src/re/fast/fastvm.rs
diff --git a/yara-x/src/re/fast/instr.rs → lib/src/re/fast/instr.rs b/yara-x/src/re/fast/instr.rs → lib/src/re/fast/instr.rs
diff --git a/yara-x/src/re/fast/mod.rs → lib/src/re/fast/mod.rs b/yara-x/src/re/fast/mod.rs → lib/src/re/fast/mod.rs
diff --git a/yara-x/src/re/hir.rs → lib/src/re/hir.rs b/yara-x/src/re/hir.rs → lib/src/re/hir.rs
diff --git a/yara-x/src/re/mod.rs → lib/src/re/mod.rs b/yara-x/src/re/mod.rs → lib/src/re/mod.rs
diff --git a/yara-x/src/re/parser.rs → lib/src/re/parser.rs b/yara-x/src/re/parser.rs → lib/src/re/parser.rs
diff --git a/yara-x/src/re/thompson/compiler.rs → lib/src/re/thompson/compiler.rs b/yara-x/src/re/thompson/compiler.rs → lib/src/re/thompson/compiler.rs
diff --git a/yara-x/src/re/thompson/instr.rs → lib/src/re/thompson/instr.rs b/yara-x/src/re/thompson/instr.rs → lib/src/re/thompson/instr.rs
diff --git a/yara-x/src/re/thompson/mod.rs → lib/src/re/thompson/mod.rs b/yara-x/src/re/thompson/mod.rs → lib/src/re/thompson/mod.rs
diff --git a/yara-x/src/re/thompson/pikevm.rs → lib/src/re/thompson/pikevm.rs b/yara-x/src/re/thompson/pikevm.rs → lib/src/re/thompson/pikevm.rs
diff --git a/yara-x/src/re/thompson/tests.rs → lib/src/re/thompson/tests.rs b/yara-x/src/re/thompson/tests.rs → lib/src/re/thompson/tests.rs
diff --git a/yara-x/src/scanner/context.rs → lib/src/scanner/context.rs b/yara-x/src/scanner/context.rs → lib/src/scanner/context.rs
diff --git a/yara-x/src/scanner/matches.rs → lib/src/scanner/matches.rs b/yara-x/src/scanner/matches.rs → lib/src/scanner/matches.rs
diff --git a/yara-x/src/scanner/mod.rs → lib/src/scanner/mod.rs b/yara-x/src/scanner/mod.rs → lib/src/scanner/mod.rs
@@ -816,7 +816,7 @@ pub struct Rule<'a, 'r> {
 
 impl<'a, 'r> Rule<'a, 'r> {
     /// Returns the rule's name.
-    pub fn name(&self) -> &'r str {
+    pub fn identifier(&self) -> &'r str {
         self.rules.ident_pool().get(self.rule_info.ident_id).unwrap()
     }
 

diff --git a/yara-x/src/scanner/tests.rs → lib/src/scanner/tests.rs b/yara-x/src/scanner/tests.rs → lib/src/scanner/tests.rs
@@ -22,18 +22,18 @@ rule rule_4 { condition: false }
     let mut iter = results.matching_rules();
 
     assert_eq!(iter.len(), 2);
-    assert_eq!(iter.next().unwrap().name(), "rule_1");
+    assert_eq!(iter.next().unwrap().identifier(), "rule_1");
     assert_eq!(iter.len(), 1);
-    assert_eq!(iter.next().unwrap().name(), "rule_3");
+    assert_eq!(iter.next().unwrap().identifier(), "rule_3");
     assert_eq!(iter.len(), 0);
     assert!(iter.next().is_none());
 
     let mut iter = results.non_matching_rules();
 
     assert_eq!(iter.len(), 2);
-    assert_eq!(iter.next().unwrap().name(), "rule_2");
+    assert_eq!(iter.next().unwrap().identifier(), "rule_2");
     assert_eq!(iter.len(), 1);
-    assert_eq!(iter.next().unwrap().name(), "rule_4");
+    assert_eq!(iter.next().unwrap().identifier(), "rule_4");
     assert_eq!(iter.len(), 0);
     assert!(iter.next().is_none());
 }
@@ -372,16 +372,16 @@ fn global_rules() {
     assert_eq!(results.matching_rules().len(), 1);
 
     let mut matching = results.matching_rules();
-    assert_eq!(matching.next().unwrap().name(), "matching");
+    assert_eq!(matching.next().unwrap().identifier(), "matching");
     assert!(matching.next().is_none());
 
     let mut non_matching = results.non_matching_rules();
 
     // `global_true` and `non_matching` don't match because they are in the
     // namespace as `global_false`.
-    assert_eq!(non_matching.next().unwrap().name(), "global_true");
-    assert_eq!(non_matching.next().unwrap().name(), "non_matching");
-    assert_eq!(non_matching.next().unwrap().name(), "global_false");
+    assert_eq!(non_matching.next().unwrap().identifier(), "global_true");
+    assert_eq!(non_matching.next().unwrap().identifier(), "non_matching");
+    assert_eq!(non_matching.next().unwrap().identifier(), "global_false");
 
     assert!(non_matching.next().is_none());
 }

diff --git a/yara-x/src/string_pool.rs → lib/src/string_pool.rs b/yara-x/src/string_pool.rs → lib/src/string_pool.rs
diff --git a/yara-x/src/symbols/mod.rs → lib/src/symbols/mod.rs b/yara-x/src/symbols/mod.rs → lib/src/symbols/mod.rs
diff --git a/yara-x/src/tests/mod.rs → lib/src/tests/mod.rs b/yara-x/src/tests/mod.rs → lib/src/tests/mod.rs
diff --git a/yara-x/src/tests/testdata/jumps.bin → lib/src/tests/testdata/jumps.bin b/yara-x/src/tests/testdata/jumps.bin → lib/src/tests/testdata/jumps.bin