diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ba84d7b30..1751b2d4e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,7 +35,6 @@ jobs:
               - 'testdata/**'
               - 'buildSrc/**'
               - 'jvm-libs/**'
-              - 'prover/lib/compressor/**'
               - 'gradle/**'
               - 'build.gradle'
               - 'gradle.properties'
@@ -48,8 +47,6 @@ jobs:
               - 'config/common/traces-limits-v2.toml'
               - 'config/coordinator/**'
               - 'e2e/**'
-              - 'contracts/abi/**'
-              - 'contracts/contracts/**'
               - 'docker/compose.yml'
               - 'docker/compose-local-dev.overrides.yml'
               - 'docker/compose-local-dev-traces-v2.overrides.yml'
@@ -68,13 +65,14 @@ jobs:
               - 'constraints'
             traces-api-facade:
               - 'traces-api-facade/**'
-              - 'jvm-libs/core/domain-models/**'
-              - 'jvm-libs/json-rpc/**'
-              - 'jvm-libs/kotlin-extensions/**'
-              - 'jvm-libs/future-extensions/**'
-              - 'jvm-libs/vertx-helper/**'
-              - 'jvm-libs/traces/**'
-              - 'jvm-libs/metrics/**'
+              - 'jvm-libs/linea/core/domain-models/**'
+              - 'jvm-libs/linea/core/traces/**'
+              - 'jvm-libs/linea/core/metrics/**'
+              - 'jvm-libs/generic/json-rpc/**'
+              - 'jvm-libs/generic/extensions/kotlin/**'
+              - 'jvm-libs/generic/extensions/futures/**'
+              - 'jvm-libs/generic/vertx-helper/**'
+              - 'jvm-libs/linea/metrics/**'
               - 'config/common/traces-limits-v1.toml'
               - '.github/workflows/traces-api-facade-*.yml'
               - '.github/workflows/build-and-publish.yml'
@@ -86,10 +84,10 @@ jobs:
               - 'gradle.properties'
               - 'settings.gradle'
             finalized-tag-updater:
-              - 'jvm-libs/core/long-running-service/**'
-              - 'jvm-libs/kotlin-extensions/**'
-              - 'jvm-libs/future-extensions/**'
-              - 'jvm-libs/web3j-extensions/**'
+              - 'jvm-libs/linea/core/long-running-service/**'
+              - 'jvm-libs/linea/web3j-extensions/**'
+              - 'jvm-libs/extensions/kotlin/**'
+              - 'jvm-libs/extensions/futures/**'
               - 'finalized-tag-updater/**'
               - '.github/workflows/main.yml'
               - '.github/workflows/finalized-tag-updater-github-release.yml'
diff --git a/coordinator/app/build.gradle b/coordinator/app/build.gradle
index d6190a940..a01d78ae7 100644
--- a/coordinator/app/build.gradle
+++ b/coordinator/app/build.gradle
@@ -10,14 +10,14 @@ configurations.configureEach {
 }
 
 dependencies {
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:http-rest')
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
-  implementation project(':jvm-libs:core:metrics')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:generic:http-rest')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:linea:web3j-extensions')
+  implementation project(':jvm-libs:linea:core:metrics')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation project(':coordinator:utilities')
   implementation project(':coordinator:core')
   implementation project(':coordinator:clients:shomei-client')
@@ -36,7 +36,7 @@ dependencies {
   implementation project(':coordinator:persistence:aggregation')
   implementation project(':coordinator:persistence:batch')
   implementation project(':coordinator:persistence:feehistory')
-  implementation project(":jvm-libs:teku-execution-client")
+  implementation project(":jvm-libs:linea:teku-execution-client")
   implementation "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
 
   implementation project(':coordinator:ethereum:gas-pricing:static-cap')
diff --git a/coordinator/clients/prover-client/file-based-client/build.gradle b/coordinator/clients/prover-client/file-based-client/build.gradle
index 46b6320b1..369148c8a 100644
--- a/coordinator/clients/prover-client/file-based-client/build.gradle
+++ b/coordinator/clients/prover-client/file-based-client/build.gradle
@@ -8,10 +8,10 @@ dependencies {
   implementation project(':coordinator:clients:smart-contract-client')
   api project(':coordinator:clients:prover-client:serialization')
   implementation project(':coordinator:utilities')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation project(':coordinator:ethereum:models-helper')
 
   implementation "io.vertx:vertx-core"
@@ -25,7 +25,7 @@ dependencies {
   implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
 
-  testImplementation project(':jvm-libs:testing-teku-helper')
+  testImplementation project(':jvm-libs:linea:testing:teku-helper')
   testImplementation "io.vertx:vertx-junit5"
   testImplementation "tech.pegasys.teku.internal:spec:${libs.versions.teku.get()}"
   testImplementation "tech.pegasys.teku.internal:spec:${libs.versions.teku.get()}:test-fixtures"
diff --git a/coordinator/clients/prover-client/serialization/build.gradle b/coordinator/clients/prover-client/serialization/build.gradle
index 665a8df8e..831635f59 100644
--- a/coordinator/clients/prover-client/serialization/build.gradle
+++ b/coordinator/clients/prover-client/serialization/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
     api "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
     api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${libs.versions.jackson.get()}")
-    api(project(":jvm-libs:kotlin-extensions"))
+    api(project(":jvm-libs:generic:extensions:kotlin"))
     api(project(":coordinator:core"))
 }
 
diff --git a/coordinator/clients/shomei-client/build.gradle b/coordinator/clients/shomei-client/build.gradle
index bb96a8a05..38206beb8 100644
--- a/coordinator/clients/shomei-client/build.gradle
+++ b/coordinator/clients/shomei-client/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 dependencies {
     implementation project(':coordinator:core')
-    implementation project(':jvm-libs:future-extensions')
-    implementation project(':jvm-libs:json-rpc')
-    implementation project(':jvm-libs:metrics:micrometer')
-    implementation project(':jvm-libs:traces')
-    implementation project(":jvm-libs:teku-execution-client")
+    implementation project(':jvm-libs:generic:extensions:futures')
+    implementation project(':jvm-libs:generic:json-rpc')
+    implementation project(':jvm-libs:linea:metrics:micrometer')
+    implementation project(':jvm-libs:linea:core:traces')
+    implementation project(":jvm-libs:linea:teku-execution-client")
     implementation "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
 
     api "io.vertx:vertx-core"
diff --git a/coordinator/clients/smart-contract-client/build.gradle b/coordinator/clients/smart-contract-client/build.gradle
index d71838e24..ddebc978b 100644
--- a/coordinator/clients/smart-contract-client/build.gradle
+++ b/coordinator/clients/smart-contract-client/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-  implementation project(":jvm-libs:kotlin-extensions")
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(":jvm-libs:generic:extensions:kotlin")
+  implementation project(':jvm-libs:linea:web3j-extensions')
   api 'build.linea:l1-rollup-contract-client:0.0.1'
   api 'build.linea:l2-message-service-contract-client:0.0.1'
 
diff --git a/coordinator/clients/traces-generator-api-client/build.gradle b/coordinator/clients/traces-generator-api-client/build.gradle
index 2c6dadd24..06230bf47 100644
--- a/coordinator/clients/traces-generator-api-client/build.gradle
+++ b/coordinator/clients/traces-generator-api-client/build.gradle
@@ -4,10 +4,10 @@ plugins {
 
 dependencies {
   implementation project(':coordinator:core')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:traces')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:linea:core:traces')
   implementation "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
 
   api "io.vertx:vertx-core"
diff --git a/coordinator/clients/type2-state-manager-client/build.gradle b/coordinator/clients/type2-state-manager-client/build.gradle
index 9879ea40e..cb2f4eeb7 100644
--- a/coordinator/clients/type2-state-manager-client/build.gradle
+++ b/coordinator/clients/type2-state-manager-client/build.gradle
@@ -4,9 +4,9 @@ plugins {
 
 dependencies {
   implementation project(':coordinator:core')
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:future-extensions')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:generic:extensions:futures')
 
   implementation "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
   implementation "io.vertx:vertx-core"
diff --git a/coordinator/clients/web3signer-client/build.gradle b/coordinator/clients/web3signer-client/build.gradle
index 88f3eaedb..6349f6f38 100644
--- a/coordinator/clients/web3signer-client/build.gradle
+++ b/coordinator/clients/web3signer-client/build.gradle
@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
   implementation project(':coordinator:core')
-  implementation project(':jvm-libs:http-rest')
+  implementation project(':jvm-libs:generic:http-rest')
 
   implementation "io.vertx:vertx-core"
   implementation "io.vertx:vertx-web-client"
diff --git a/coordinator/core/build.gradle b/coordinator/core/build.gradle
index 8b2b8cc6d..d4691ded3 100644
--- a/coordinator/core/build.gradle
+++ b/coordinator/core/build.gradle
@@ -6,16 +6,16 @@ plugins {
 dependencies {
   api "build.linea:blob-compressor:${libs.versions.blobCompressor.get()}"
   api "build.linea:blob-shnarf-calculator:${libs.versions.blobShnarfCalculator.get()}"
-  api project(':jvm-libs:core:domain-models')
-  api project(':jvm-libs:core:metrics')
-  api project(':jvm-libs:core:long-running-service')
-  api project(':jvm-libs:traces')
-  api project(':jvm-libs:errors')
-  api project(':jvm-libs:kotlin-extensions')
-  api project(':jvm-libs:future-extensions')
+  api project(':jvm-libs:linea:core:domain-models')
+  api project(':jvm-libs:linea:core:metrics')
+  api project(':jvm-libs:linea:core:long-running-service')
+  api project(':jvm-libs:linea:core:traces')
+  api project(':jvm-libs:generic:errors')
+  api project(':jvm-libs:generic:extensions:kotlin')
+  api project(':jvm-libs:generic:extensions:futures')
   api "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
   api "org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinxDatetime.get()}"
-  implementation project(":jvm-libs:teku-execution-client")
+  implementation project(":jvm-libs:linea:teku-execution-client")
   implementation "io.vertx:vertx-core"
   // jackson shall never be used in the core module
   // however, it is used already :( but was as transitive through Teku Execution Client
@@ -31,10 +31,10 @@ dependencies {
   testFixturesImplementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: 'org.slf4j', module: 'slf4j-nop'
   }
-  testImplementation project(":jvm-libs:testing-teku-helper")
-  testImplementation project(':jvm-libs:metrics:micrometer')
-  testImplementation(testFixtures(project(':jvm-libs:traces')))
-  testImplementation(testFixtures(project(':jvm-libs:kotlin-extensions')))
+  testImplementation project(":jvm-libs:linea:testing:teku-helper")
+  testImplementation project(':jvm-libs:linea:metrics:micrometer')
+  testImplementation(testFixtures(project(':jvm-libs:linea:core:traces')))
+  testImplementation(testFixtures(project(':jvm-libs:generic:extensions:kotlin')))
   testImplementation("io.vertx:vertx-junit5")
 }
 
diff --git a/coordinator/ethereum/blob-submitter/build.gradle b/coordinator/ethereum/blob-submitter/build.gradle
index 27a0ac993..d9c07ef0e 100644
--- a/coordinator/ethereum/blob-submitter/build.gradle
+++ b/coordinator/ethereum/blob-submitter/build.gradle
@@ -21,14 +21,14 @@ dependencies {
   implementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: "org.slf4j", module: "slf4j-nop"
   }
-  implementation project(":jvm-libs:teku-execution-client")
+  implementation project(":jvm-libs:linea:teku-execution-client")
 
-  testImplementation(project(":jvm-libs:testing:l1-blob-and-proof-submission"))
+  testImplementation(project(":jvm-libs:linea:testing:l1-blob-and-proof-submission"))
   testImplementation(project(":coordinator:persistence:aggregation"))
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
   testImplementation(testFixtures(project(":coordinator:ethereum:gas-pricing")))
   testImplementation(testFixtures(project(":coordinator:core")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}")
   testImplementation("com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}")
diff --git a/coordinator/ethereum/common/build.gradle b/coordinator/ethereum/common/build.gradle
index ce7b306dd..5c6e803de 100644
--- a/coordinator/ethereum/common/build.gradle
+++ b/coordinator/ethereum/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation(project(':coordinator:core'))
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(':jvm-libs:linea:web3j-extensions')
   implementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: "org.slf4j", module: "slf4j-nop"
   }
diff --git a/coordinator/ethereum/finalization-monitor/build.gradle b/coordinator/ethereum/finalization-monitor/build.gradle
index 9a9dc928c..4e1e6605b 100644
--- a/coordinator/ethereum/finalization-monitor/build.gradle
+++ b/coordinator/ethereum/finalization-monitor/build.gradle
@@ -14,11 +14,11 @@ dependencies {
     exclude group: "org.slf4j", module: "slf4j-nop"
   }
   implementation(project(":coordinator:clients:smart-contract-client"))
-  implementation(project(":jvm-libs:future-extensions"))
+  implementation(project(":jvm-libs:generic:extensions:futures"))
 
   testImplementation(project(":coordinator:ethereum:test-utils"))
-  testImplementation(project(":jvm-libs:web3j-extensions"))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(project(":jvm-libs:linea:web3j-extensions"))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 }
 
diff --git a/coordinator/ethereum/gas-pricing/build.gradle b/coordinator/ethereum/gas-pricing/build.gradle
index 3ef732c01..6261396bb 100644
--- a/coordinator/ethereum/gas-pricing/build.gradle
+++ b/coordinator/ethereum/gas-pricing/build.gradle
@@ -4,9 +4,9 @@ plugins {
 }
 
 dependencies {
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:core:domain-models')
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:core:domain-models')
+  implementation project(':jvm-libs:linea:web3j-extensions')
 
   testFixturesImplementation "tech.pegasys.teku.internal:async:${libs.versions.teku.get()}"
   testFixturesImplementation project(":coordinator:core")
diff --git a/coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle b/coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle
index dbdf008d4..8add5a634 100644
--- a/coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle
+++ b/coordinator/ethereum/gas-pricing/dynamic-cap/build.gradle
@@ -3,10 +3,10 @@ plugins {
 }
 
 dependencies {
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:web3j-extensions')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation(project(":coordinator:core"))
   implementation(project(":coordinator:ethereum:gas-pricing"))
 
diff --git a/coordinator/ethereum/gas-pricing/static-cap/build.gradle b/coordinator/ethereum/gas-pricing/static-cap/build.gradle
index 7390d0213..7c6da96b2 100644
--- a/coordinator/ethereum/gas-pricing/static-cap/build.gradle
+++ b/coordinator/ethereum/gas-pricing/static-cap/build.gradle
@@ -5,11 +5,11 @@ plugins {
 dependencies {
   implementation(project(":coordinator:core"))
   implementation(project(":coordinator:ethereum:gas-pricing"))
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:core:domain-models')
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:web3j-extensions')
-  implementation project(':jvm-libs:json-rpc')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:linea:core:domain-models')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:linea:web3j-extensions')
+  implementation project(':jvm-libs:generic:json-rpc')
 
   testImplementation("io.vertx:vertx-junit5")
   testImplementation "com.github.tomakehurst:wiremock-jre8:${libs.versions.wiremock.get()}"
diff --git a/coordinator/ethereum/message-anchoring/build.gradle b/coordinator/ethereum/message-anchoring/build.gradle
index 311cc3526..8b00aa378 100644
--- a/coordinator/ethereum/message-anchoring/build.gradle
+++ b/coordinator/ethereum/message-anchoring/build.gradle
@@ -5,9 +5,9 @@ plugins {
 dependencies {
   // TODO: review dependencies
   implementation "io.vertx:vertx-core"
-  implementation project(':jvm-libs:vertx-helper')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(':jvm-libs:generic:vertx-helper')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:linea:web3j-extensions')
   implementation project(':coordinator:utilities')
   implementation project(':coordinator:core')
   implementation project(':coordinator:clients:smart-contract-client')
diff --git a/coordinator/ethereum/models-helper/build.gradle b/coordinator/ethereum/models-helper/build.gradle
index 6c79656dd..45ddee94e 100644
--- a/coordinator/ethereum/models-helper/build.gradle
+++ b/coordinator/ethereum/models-helper/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 dependencies {
   api (project(":coordinator:core"))
-  api project(":jvm-libs:teku-execution-client")
+  api project(":jvm-libs:linea:teku-execution-client")
   implementation "org.hyperledger.besu:besu-datatypes:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu:evm:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu.internal:rlp:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu.internal:core:${libs.versions.besu.get()}"
 
-  testImplementation project(":jvm-libs:testing-teku-helper")
+  testImplementation project(":jvm-libs:linea:testing:teku-helper")
 }
diff --git a/coordinator/ethereum/test-utils/build.gradle b/coordinator/ethereum/test-utils/build.gradle
index 38a4a9c41..4f0b4e040 100644
--- a/coordinator/ethereum/test-utils/build.gradle
+++ b/coordinator/ethereum/test-utils/build.gradle
@@ -8,9 +8,9 @@ plugins {
 dependencies {
   implementation(project(":coordinator:core"))
   implementation(project(":coordinator:clients:smart-contract-client"))
-  implementation(project(":jvm-libs:web3j-extensions"))
+  implementation(project(":jvm-libs:linea:web3j-extensions"))
   implementation(project(":coordinator:ethereum:common"))
-  implementation(project(":jvm-libs:testing:file-system"))
+  implementation(project(":jvm-libs:linea:testing:file-system"))
   implementation("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: 'org.slf4j', module: 'slf4j-nop'
   }
diff --git a/coordinator/persistence/aggregation/build.gradle b/coordinator/persistence/aggregation/build.gradle
index d9fdbf53c..4724313bc 100644
--- a/coordinator/persistence/aggregation/build.gradle
+++ b/coordinator/persistence/aggregation/build.gradle
@@ -12,7 +12,7 @@ dependencies {
   testImplementation(project(":coordinator:persistence:blob"))
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
   testImplementation(testFixtures(project(":coordinator:core")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 }
 
diff --git a/coordinator/persistence/batch/build.gradle b/coordinator/persistence/batch/build.gradle
index dec18c0e3..6a21860d7 100644
--- a/coordinator/persistence/batch/build.gradle
+++ b/coordinator/persistence/batch/build.gradle
@@ -7,14 +7,14 @@ plugins {
 dependencies {
   api(project(":coordinator:core"))
   implementation(project(":coordinator:persistence:db"))
-  implementation(project(":jvm-libs:core:metrics"))
+  implementation(project(":jvm-libs:linea:core:metrics"))
   implementation(project(":coordinator:clients:prover-client:file-based-client")) {
     because "ProverResponseIndex is a part of it"
   }
 
   testImplementation(testFixtures(project(":coordinator:core")))
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 
   testFixturesImplementation(testFixtures(project(":coordinator:persistence:db")))
diff --git a/coordinator/persistence/blob/build.gradle b/coordinator/persistence/blob/build.gradle
index 491fde5cb..1e925547d 100644
--- a/coordinator/persistence/blob/build.gradle
+++ b/coordinator/persistence/blob/build.gradle
@@ -17,7 +17,7 @@ dependencies {
   testImplementation("tech.pegasys.teku.internal:executionclient:${libs.versions.teku.get()}")
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
   testImplementation(testFixtures(project(":coordinator:core")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 
   testFixturesImplementation('tech.pegasys.teku.internal:async:23.1.1')
diff --git a/coordinator/persistence/db/build.gradle b/coordinator/persistence/db/build.gradle
index bc7f202f4..b5ae0983f 100644
--- a/coordinator/persistence/db/build.gradle
+++ b/coordinator/persistence/db/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     because("Flyway DB and other dependencies use SLF4J")
   }
 
-  testImplementation testFixtures(project(':jvm-libs:kotlin-extensions'))
+  testImplementation testFixtures(project(':jvm-libs:generic:extensions:kotlin'))
   testFixturesApi(platform("org.junit:junit-bom:${libs.versions.junit.get()}"))
   testFixturesApi("io.vertx:vertx-junit5:${libs.versions.vertx.get()}")
 }
diff --git a/coordinator/persistence/feehistory/build.gradle b/coordinator/persistence/feehistory/build.gradle
index 962035e70..3af97d539 100644
--- a/coordinator/persistence/feehistory/build.gradle
+++ b/coordinator/persistence/feehistory/build.gradle
@@ -15,7 +15,7 @@ dependencies {
   testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}")
   testImplementation("tech.pegasys.teku.internal:executionclient:${libs.versions.teku.get()}")
   testImplementation(testFixtures(project(":coordinator:persistence:db")))
-  testImplementation(testFixtures(project(":jvm-libs:kotlin-extensions")))
+  testImplementation(testFixtures(project(":jvm-libs:generic:extensions:kotlin")))
   testImplementation("io.vertx:vertx-junit5")
 }
 
diff --git a/coordinator/utilities/build.gradle b/coordinator/utilities/build.gradle
index 884ec728a..5b4363f5b 100644
--- a/coordinator/utilities/build.gradle
+++ b/coordinator/utilities/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:errors')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:generic:errors')
   implementation "org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinxDatetime.get()}"
   implementation "io.vertx:vertx-core"
   implementation "com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}"
@@ -14,7 +14,7 @@ dependencies {
 
   testImplementation "org.junit.jupiter:junit-jupiter"
   testImplementation "io.vertx:vertx-junit5"
-  testImplementation testFixtures(project(':jvm-libs:kotlin-extensions'))
+  testImplementation testFixtures(project(':jvm-libs:generic:extensions:kotlin'))
 }
 
 test {
diff --git a/finalized-tag-updater/build.gradle b/finalized-tag-updater/build.gradle
index 300c392ef..42e4f1b37 100644
--- a/finalized-tag-updater/build.gradle
+++ b/finalized-tag-updater/build.gradle
@@ -36,10 +36,10 @@ dependencies {
   compileOnly 'info.picocli:picocli:4.7.6'
   compileOnly 'io.vertx:vertx-core'
 
-  implementation project(":jvm-libs:kotlin-extensions")
-  implementation project(':jvm-libs:core:long-running-service')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(":jvm-libs:generic:extensions:kotlin")
+  implementation project(':jvm-libs:linea:core:long-running-service')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:linea:web3j-extensions')
   implementation 'build.linea:l1-rollup-contract-client:0.0.1'
   implementation ("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: 'org.slf4j', module: 'slf4j-nop'
diff --git a/jvm-libs/errors/build.gradle b/jvm-libs/generic/errors/build.gradle
similarity index 100%
rename from jvm-libs/errors/build.gradle
rename to jvm-libs/generic/errors/build.gradle
diff --git a/jvm-libs/errors/src/main/kotlin/net/consensys/linea/errors/ErrorResponse.kt b/jvm-libs/generic/errors/src/main/kotlin/net/consensys/linea/errors/ErrorResponse.kt
similarity index 100%
rename from jvm-libs/errors/src/main/kotlin/net/consensys/linea/errors/ErrorResponse.kt
rename to jvm-libs/generic/errors/src/main/kotlin/net/consensys/linea/errors/ErrorResponse.kt
diff --git a/jvm-libs/future-extensions/build.gradle b/jvm-libs/generic/extensions/futures/build.gradle
similarity index 100%
rename from jvm-libs/future-extensions/build.gradle
rename to jvm-libs/generic/extensions/futures/build.gradle
diff --git a/jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/AsyncFilter.kt b/jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/AsyncFilter.kt
similarity index 100%
rename from jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/AsyncFilter.kt
rename to jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/AsyncFilter.kt
diff --git a/jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/AsyncRetryer.kt b/jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/AsyncRetryer.kt
similarity index 100%
rename from jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/AsyncRetryer.kt
rename to jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/AsyncRetryer.kt
diff --git a/jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/Future.kt b/jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/Future.kt
similarity index 100%
rename from jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/Future.kt
rename to jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/Future.kt
diff --git a/jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/VertxFutureExtensions.kt b/jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/VertxFutureExtensions.kt
similarity index 100%
rename from jvm-libs/future-extensions/src/main/kotlin/net/consensys/linea/async/VertxFutureExtensions.kt
rename to jvm-libs/generic/extensions/futures/src/main/kotlin/net/consensys/linea/async/VertxFutureExtensions.kt
diff --git a/jvm-libs/future-extensions/src/test/kotlin/net/consensys/linea/async/AsyncRetryerTest.kt b/jvm-libs/generic/extensions/futures/src/test/kotlin/net/consensys/linea/async/AsyncRetryerTest.kt
similarity index 100%
rename from jvm-libs/future-extensions/src/test/kotlin/net/consensys/linea/async/AsyncRetryerTest.kt
rename to jvm-libs/generic/extensions/futures/src/test/kotlin/net/consensys/linea/async/AsyncRetryerTest.kt
diff --git a/jvm-libs/kotlin-extensions/build.gradle b/jvm-libs/generic/extensions/kotlin/build.gradle
similarity index 100%
rename from jvm-libs/kotlin-extensions/build.gradle
rename to jvm-libs/generic/extensions/kotlin/build.gradle
diff --git a/jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/ByteArrayExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/ByteArrayExtensions.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/ByteArrayExtensions.kt
rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/ByteArrayExtensions.kt
diff --git a/jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/CollectionsExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/CollectionsExtensions.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/CollectionsExtensions.kt
rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/CollectionsExtensions.kt
diff --git a/jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/InstantExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/InstantExtensions.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/InstantExtensions.kt
rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/InstantExtensions.kt
diff --git a/jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/MathExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/MathExtensions.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/MathExtensions.kt
rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/MathExtensions.kt
diff --git a/jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/TypingsExtensions.kt b/jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/TypingsExtensions.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/main/kotlin/net/consensys/TypingsExtensions.kt
rename to jvm-libs/generic/extensions/kotlin/src/main/kotlin/net/consensys/TypingsExtensions.kt
diff --git a/jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt
rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/ByteArrayExtensionsTest.kt
diff --git a/jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt
rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/CollectionsExtensionsTest.kt
diff --git a/jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/InstantExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/InstantExtensionsTest.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/InstantExtensionsTest.kt
rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/InstantExtensionsTest.kt
diff --git a/jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/MathExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/MathExtensionsTest.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/MathExtensionsTest.kt
rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/MathExtensionsTest.kt
diff --git a/jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt b/jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt
rename to jvm-libs/generic/extensions/kotlin/src/test/kotlin/net/consensys/TypingsExtensionsTest.kt
diff --git a/jvm-libs/kotlin-extensions/src/testFixtures/kotlin/net/consensys/FakeFixedClock.kt b/jvm-libs/generic/extensions/kotlin/src/testFixtures/kotlin/net/consensys/FakeFixedClock.kt
similarity index 100%
rename from jvm-libs/kotlin-extensions/src/testFixtures/kotlin/net/consensys/FakeFixedClock.kt
rename to jvm-libs/generic/extensions/kotlin/src/testFixtures/kotlin/net/consensys/FakeFixedClock.kt
diff --git a/jvm-libs/http-rest/build.gradle b/jvm-libs/generic/http-rest/build.gradle
similarity index 70%
rename from jvm-libs/http-rest/build.gradle
rename to jvm-libs/generic/http-rest/build.gradle
index 34bbe11aa..c6b8552bf 100644
--- a/jvm-libs/http-rest/build.gradle
+++ b/jvm-libs/generic/http-rest/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-  implementation project(":jvm-libs:errors")
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(":jvm-libs:metrics:micrometer")
+  implementation project(":jvm-libs:generic:errors")
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(":jvm-libs:linea:metrics:micrometer")
   implementation "io.vertx:vertx-core"
   implementation "io.vertx:vertx-web-client"
 
diff --git a/jvm-libs/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/HttpRestClient.kt b/jvm-libs/generic/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/HttpRestClient.kt
similarity index 100%
rename from jvm-libs/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/HttpRestClient.kt
rename to jvm-libs/generic/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/HttpRestClient.kt
diff --git a/jvm-libs/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/VertxHttpRestClient.kt b/jvm-libs/generic/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/VertxHttpRestClient.kt
similarity index 100%
rename from jvm-libs/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/VertxHttpRestClient.kt
rename to jvm-libs/generic/http-rest/src/main/kotlin/net/consensys/linea/httprest/client/VertxHttpRestClient.kt
diff --git a/jvm-libs/http-rest/src/test/kotlin/VertxHttpRestClientTest.kt b/jvm-libs/generic/http-rest/src/test/kotlin/VertxHttpRestClientTest.kt
similarity index 100%
rename from jvm-libs/http-rest/src/test/kotlin/VertxHttpRestClientTest.kt
rename to jvm-libs/generic/http-rest/src/test/kotlin/VertxHttpRestClientTest.kt
diff --git a/jvm-libs/json-rpc/build.gradle b/jvm-libs/generic/json-rpc/build.gradle
similarity index 86%
rename from jvm-libs/json-rpc/build.gradle
rename to jvm-libs/generic/json-rpc/build.gradle
index 9a06d380d..af5f59a91 100644
--- a/jvm-libs/json-rpc/build.gradle
+++ b/jvm-libs/generic/json-rpc/build.gradle
@@ -4,9 +4,9 @@ plugins {
 }
 
 dependencies {
-  implementation project(":jvm-libs:metrics:micrometer")
-  implementation project(":jvm-libs:future-extensions")
-  implementation project(":jvm-libs:kotlin-extensions")
+  implementation project(":jvm-libs:linea:metrics:micrometer")
+  implementation project(":jvm-libs:generic:extensions:futures")
+  implementation project(":jvm-libs:generic:extensions:kotlin")
   implementation project(":jvm-libs:generic:serialization:jackson")
   implementation "com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}"
   api "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
diff --git a/jvm-libs/json-rpc/src/main/java/net/consensys/linea/jsonrpc/argument/TypeCast.java b/jvm-libs/generic/json-rpc/src/main/java/net/consensys/linea/jsonrpc/argument/TypeCast.java
similarity index 100%
rename from jvm-libs/json-rpc/src/main/java/net/consensys/linea/jsonrpc/argument/TypeCast.java
rename to jvm-libs/generic/json-rpc/src/main/java/net/consensys/linea/jsonrpc/argument/TypeCast.java
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/HttpRequestHandler.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/HttpRequestHandler.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/HttpRequestHandler.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/HttpRequestHandler.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessor.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessor.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessor.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessor.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequest.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequest.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequest.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequestRouter.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequestRouter.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequestRouter.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequestRouter.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcResponse.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcResponse.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcResponse.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcResponse.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetter.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetter.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetter.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetter.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcClient.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcClient.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcClient.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcClient.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOut.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOut.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOut.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOut.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryer.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryer.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryer.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryer.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerV2.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerV2.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerV2.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerV2.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2Client.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2Client.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2Client.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2Client.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImpl.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImpl.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImpl.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImpl.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClient.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClient.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClient.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClient.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/ObjectMappers.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/ObjectMappers.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/ObjectMappers.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/ObjectMappers.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClient.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClient.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClient.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClient.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientFactory.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientFactory.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientFactory.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientFactory.kt
diff --git a/jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/httpserver/HttpJsonRpcServer.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/httpserver/HttpJsonRpcServer.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/httpserver/HttpJsonRpcServer.kt
rename to jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/httpserver/HttpJsonRpcServer.kt
diff --git a/jvm-libs/json-rpc/src/test/java/net/consensys/linea/jsonrpc/argument/TypeCastTest.java b/jvm-libs/generic/json-rpc/src/test/java/net/consensys/linea/jsonrpc/argument/TypeCastTest.java
similarity index 100%
rename from jvm-libs/json-rpc/src/test/java/net/consensys/linea/jsonrpc/argument/TypeCastTest.java
rename to jvm-libs/generic/json-rpc/src/test/java/net/consensys/linea/jsonrpc/argument/TypeCastTest.java
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessorTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessorTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessorTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/JsonRpcMessageProcessorTest.kt
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetterTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetterTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetterTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/argument/ArgumentGetterTest.kt
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOutTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOutTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOutTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestFanOutTest.kt
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerTest.kt
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClientTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClientTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClientTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/LoadBalancingJsonRpcClientTest.kt
diff --git a/jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt b/jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt
similarity index 100%
rename from jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt
rename to jvm-libs/generic/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/VertxHttpJsonRpcClientTest.kt
diff --git a/jvm-libs/json-rpc/src/test/resources/log4j2.xml b/jvm-libs/generic/json-rpc/src/test/resources/log4j2.xml
similarity index 100%
rename from jvm-libs/json-rpc/src/test/resources/log4j2.xml
rename to jvm-libs/generic/json-rpc/src/test/resources/log4j2.xml
diff --git a/jvm-libs/logging/build.gradle b/jvm-libs/generic/logging/build.gradle
similarity index 84%
rename from jvm-libs/logging/build.gradle
rename to jvm-libs/generic/logging/build.gradle
index d6aa5bc03..938d26a7b 100644
--- a/jvm-libs/logging/build.gradle
+++ b/jvm-libs/generic/logging/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-  implementation(project(':jvm-libs:kotlin-extensions'))
+  implementation(project(':jvm-libs:generic:extensions:kotlin'))
   testImplementation "org.apache.logging.log4j:log4j-core-test:${libs.versions.log4j.get()}"
 }
 
diff --git a/jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/DebouncingFilter.kt b/jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/DebouncingFilter.kt
similarity index 100%
rename from jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/DebouncingFilter.kt
rename to jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/DebouncingFilter.kt
diff --git a/jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/JsonRpcRequestResponseLogger.kt b/jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/JsonRpcRequestResponseLogger.kt
similarity index 100%
rename from jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/JsonRpcRequestResponseLogger.kt
rename to jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/JsonRpcRequestResponseLogger.kt
diff --git a/jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/KnownErrors.kt b/jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/KnownErrors.kt
similarity index 100%
rename from jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/KnownErrors.kt
rename to jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/KnownErrors.kt
diff --git a/jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/Log4jLineaRewriter.kt b/jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/Log4jLineaRewriter.kt
similarity index 100%
rename from jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/Log4jLineaRewriter.kt
rename to jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/Log4jLineaRewriter.kt
diff --git a/jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/Masks.kt b/jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/Masks.kt
similarity index 100%
rename from jvm-libs/logging/src/main/kotlin/net/consensys/linea/logging/Masks.kt
rename to jvm-libs/generic/logging/src/main/kotlin/net/consensys/linea/logging/Masks.kt
diff --git a/jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/CustomLog4JLoggerIntegrationTest.kt b/jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/CustomLog4JLoggerIntegrationTest.kt
similarity index 100%
rename from jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/CustomLog4JLoggerIntegrationTest.kt
rename to jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/CustomLog4JLoggerIntegrationTest.kt
diff --git a/jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/DebouncingFilterTest.kt b/jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/DebouncingFilterTest.kt
similarity index 100%
rename from jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/DebouncingFilterTest.kt
rename to jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/DebouncingFilterTest.kt
diff --git a/jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/Log4JLineaAppenderTest.kt b/jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/Log4JLineaAppenderTest.kt
similarity index 100%
rename from jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/Log4JLineaAppenderTest.kt
rename to jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/Log4JLineaAppenderTest.kt
diff --git a/jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/MasksTest.kt b/jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/MasksTest.kt
similarity index 100%
rename from jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/MasksTest.kt
rename to jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/MasksTest.kt
diff --git a/jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/MinimalInLineJsonRpcLoggerTest.kt b/jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/MinimalInLineJsonRpcLoggerTest.kt
similarity index 100%
rename from jvm-libs/logging/src/test/kotlin/net/consensys/linea/logging/MinimalInLineJsonRpcLoggerTest.kt
rename to jvm-libs/generic/logging/src/test/kotlin/net/consensys/linea/logging/MinimalInLineJsonRpcLoggerTest.kt
diff --git a/jvm-libs/logging/src/test/resources/log4j2.xml b/jvm-libs/generic/logging/src/test/resources/log4j2.xml
similarity index 100%
rename from jvm-libs/logging/src/test/resources/log4j2.xml
rename to jvm-libs/generic/logging/src/test/resources/log4j2.xml
diff --git a/jvm-libs/generic/serialization/jackson/build.gradle b/jvm-libs/generic/serialization/jackson/build.gradle
index 6c14517dc..27f0c6a9d 100644
--- a/jvm-libs/generic/serialization/jackson/build.gradle
+++ b/jvm-libs/generic/serialization/jackson/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation(project(':jvm-libs:kotlin-extensions'))
+  implementation(project(':jvm-libs:generic:extensions:kotlin'))
   api "com.fasterxml.jackson.core:jackson-annotations:${libs.versions.jackson.get()}"
   api "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
   api "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
diff --git a/jvm-libs/vertx-helper/build.gradle b/jvm-libs/generic/vertx-helper/build.gradle
similarity index 92%
rename from jvm-libs/vertx-helper/build.gradle
rename to jvm-libs/generic/vertx-helper/build.gradle
index 55c19699a..d2cf40bb7 100644
--- a/jvm-libs/vertx-helper/build.gradle
+++ b/jvm-libs/generic/vertx-helper/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation project(':jvm-libs:future-extensions')
+  implementation project(':jvm-libs:generic:extensions:futures')
   implementation "io.vertx:vertx-core"
   implementation "io.vertx:vertx-web"
   implementation "io.vertx:vertx-lang-kotlin"
diff --git a/jvm-libs/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ObservabilityServer.kt b/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ObservabilityServer.kt
similarity index 100%
rename from jvm-libs/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ObservabilityServer.kt
rename to jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/ObservabilityServer.kt
diff --git a/jvm-libs/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/VertxConfiguration.kt b/jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/VertxConfiguration.kt
similarity index 100%
rename from jvm-libs/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/VertxConfiguration.kt
rename to jvm-libs/generic/vertx-helper/src/main/kotlin/net/consensys/linea/vertx/VertxConfiguration.kt
diff --git a/jvm-libs/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ObservabilityServerTest.kt b/jvm-libs/generic/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ObservabilityServerTest.kt
similarity index 100%
rename from jvm-libs/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ObservabilityServerTest.kt
rename to jvm-libs/generic/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ObservabilityServerTest.kt
diff --git a/jvm-libs/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ResourcesConfigurableVertxParameterProvider.kt b/jvm-libs/generic/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ResourcesConfigurableVertxParameterProvider.kt
similarity index 100%
rename from jvm-libs/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ResourcesConfigurableVertxParameterProvider.kt
rename to jvm-libs/generic/vertx-helper/src/test/kotlin/net/consensys/linea/vertx/ResourcesConfigurableVertxParameterProvider.kt
diff --git a/jvm-libs/vertx-helper/src/test/resources/META-INF/services/io.vertx.junit5.VertxExtensionParameterProvider b/jvm-libs/generic/vertx-helper/src/test/resources/META-INF/services/io.vertx.junit5.VertxExtensionParameterProvider
similarity index 100%
rename from jvm-libs/vertx-helper/src/test/resources/META-INF/services/io.vertx.junit5.VertxExtensionParameterProvider
rename to jvm-libs/generic/vertx-helper/src/test/resources/META-INF/services/io.vertx.junit5.VertxExtensionParameterProvider
diff --git a/jvm-libs/vertx-helper/src/test/resources/vertx-options.json b/jvm-libs/generic/vertx-helper/src/test/resources/vertx-options.json
similarity index 100%
rename from jvm-libs/vertx-helper/src/test/resources/vertx-options.json
rename to jvm-libs/generic/vertx-helper/src/test/resources/vertx-options.json
diff --git a/jvm-libs/blob-compressor/build.gradle b/jvm-libs/linea/blob-compressor/build.gradle
similarity index 90%
rename from jvm-libs/blob-compressor/build.gradle
rename to jvm-libs/linea/blob-compressor/build.gradle
index 7e590c213..c2281e817 100644
--- a/jvm-libs/blob-compressor/build.gradle
+++ b/jvm-libs/linea/blob-compressor/build.gradle
@@ -10,8 +10,8 @@ apply from: rootProject.file("gradle/publishing.gradle")
 
 dependencies {
   implementation "net.java.dev.jna:jna:${libs.versions.jna.get()}"
-  testImplementation project(":jvm-libs:kotlin-extensions")
-  testImplementation project(":jvm-libs:blob-shnarf-calculator")
+  testImplementation project(":jvm-libs:generic:extensions:kotlin")
+  testImplementation project(":jvm-libs:linea:blob-shnarf-calculator")
 }
 
 jar {
diff --git a/jvm-libs/blob-compressor/src/main/kotlin/net/consensys/jvm/ResourcesUtil.kt b/jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/jvm/ResourcesUtil.kt
similarity index 100%
rename from jvm-libs/blob-compressor/src/main/kotlin/net/consensys/jvm/ResourcesUtil.kt
rename to jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/jvm/ResourcesUtil.kt
diff --git a/jvm-libs/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt b/jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt
similarity index 100%
rename from jvm-libs/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt
rename to jvm-libs/linea/blob-compressor/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobCompressor.kt
diff --git a/jvm-libs/blob-compressor/src/main/resources/.gitignore b/jvm-libs/linea/blob-compressor/src/main/resources/.gitignore
similarity index 100%
rename from jvm-libs/blob-compressor/src/main/resources/.gitignore
rename to jvm-libs/linea/blob-compressor/src/main/resources/.gitignore
diff --git a/jvm-libs/blob-compressor/src/main/resources/compressor_dict.bin b/jvm-libs/linea/blob-compressor/src/main/resources/compressor_dict.bin
similarity index 100%
rename from jvm-libs/blob-compressor/src/main/resources/compressor_dict.bin
rename to jvm-libs/linea/blob-compressor/src/main/resources/compressor_dict.bin
diff --git a/jvm-libs/blob-compressor/src/test/kotlin/net/consensys/jvm/ResourcesUtilTest.kt b/jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/jvm/ResourcesUtilTest.kt
similarity index 100%
rename from jvm-libs/blob-compressor/src/test/kotlin/net/consensys/jvm/ResourcesUtilTest.kt
rename to jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/jvm/ResourcesUtilTest.kt
diff --git a/jvm-libs/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt b/jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt
similarity index 100%
rename from jvm-libs/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt
rename to jvm-libs/linea/blob-compressor/src/test/kotlin/net/consensys/linea/blob/GoNativeCompressorAndShnarfCalculatorIntTest.kt
diff --git a/jvm-libs/blob-compressor/src/test/resources/net/consensys/linea/nativecompressor/rlp_blocks.bin b/jvm-libs/linea/blob-compressor/src/test/resources/net/consensys/linea/nativecompressor/rlp_blocks.bin
similarity index 100%
rename from jvm-libs/blob-compressor/src/test/resources/net/consensys/linea/nativecompressor/rlp_blocks.bin
rename to jvm-libs/linea/blob-compressor/src/test/resources/net/consensys/linea/nativecompressor/rlp_blocks.bin
diff --git a/jvm-libs/blob-compressor/src/test/resources/root-resource.txt b/jvm-libs/linea/blob-compressor/src/test/resources/root-resource.txt
similarity index 100%
rename from jvm-libs/blob-compressor/src/test/resources/root-resource.txt
rename to jvm-libs/linea/blob-compressor/src/test/resources/root-resource.txt
diff --git a/jvm-libs/blob-compressor/src/test/resources/test/folder/nested-resource.txt b/jvm-libs/linea/blob-compressor/src/test/resources/test/folder/nested-resource.txt
similarity index 100%
rename from jvm-libs/blob-compressor/src/test/resources/test/folder/nested-resource.txt
rename to jvm-libs/linea/blob-compressor/src/test/resources/test/folder/nested-resource.txt
diff --git a/jvm-libs/blob-compressor/src/test/resources/test/folder2/nested-resource.txt b/jvm-libs/linea/blob-compressor/src/test/resources/test/folder2/nested-resource.txt
similarity index 100%
rename from jvm-libs/blob-compressor/src/test/resources/test/folder2/nested-resource.txt
rename to jvm-libs/linea/blob-compressor/src/test/resources/test/folder2/nested-resource.txt
diff --git a/jvm-libs/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/CompressorTestData.kt b/jvm-libs/linea/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/CompressorTestData.kt
similarity index 100%
rename from jvm-libs/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/CompressorTestData.kt
rename to jvm-libs/linea/blob-compressor/src/testFixtures/kotlin/net/consensys/linea/nativecompressor/CompressorTestData.kt
diff --git a/jvm-libs/blob-compressor/src/testFixtures/resources/rlp_blocks.bin b/jvm-libs/linea/blob-compressor/src/testFixtures/resources/rlp_blocks.bin
similarity index 100%
rename from jvm-libs/blob-compressor/src/testFixtures/resources/rlp_blocks.bin
rename to jvm-libs/linea/blob-compressor/src/testFixtures/resources/rlp_blocks.bin
diff --git a/jvm-libs/blob-shnarf-calculator/build.gradle b/jvm-libs/linea/blob-shnarf-calculator/build.gradle
similarity index 94%
rename from jvm-libs/blob-shnarf-calculator/build.gradle
rename to jvm-libs/linea/blob-shnarf-calculator/build.gradle
index f8e572a75..2d2ecfa38 100644
--- a/jvm-libs/blob-shnarf-calculator/build.gradle
+++ b/jvm-libs/linea/blob-shnarf-calculator/build.gradle
@@ -9,7 +9,7 @@ apply from: rootProject.file("gradle/publishing.gradle")
 
 dependencies {
   api "net.java.dev.jna:jna:${libs.versions.jna.get()}"
-  testImplementation project(":jvm-libs:kotlin-extensions")
+  testImplementation project(":jvm-libs:generic:extensions:kotlin")
 }
 
 jar {
diff --git a/jvm-libs/blob-shnarf-calculator/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculator.kt b/jvm-libs/linea/blob-shnarf-calculator/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculator.kt
similarity index 100%
rename from jvm-libs/blob-shnarf-calculator/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculator.kt
rename to jvm-libs/linea/blob-shnarf-calculator/src/main/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculator.kt
diff --git a/jvm-libs/blob-shnarf-calculator/src/main/resources/.gitignore b/jvm-libs/linea/blob-shnarf-calculator/src/main/resources/.gitignore
similarity index 100%
rename from jvm-libs/blob-shnarf-calculator/src/main/resources/.gitignore
rename to jvm-libs/linea/blob-shnarf-calculator/src/main/resources/.gitignore
diff --git a/jvm-libs/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt b/jvm-libs/linea/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt
similarity index 100%
rename from jvm-libs/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt
rename to jvm-libs/linea/blob-shnarf-calculator/src/test/kotlin/net/consensys/linea/blob/GoNativeBlobShnarfCalculatorTest.kt
diff --git a/jvm-libs/core/domain-models/build.gradle b/jvm-libs/linea/core/domain-models/build.gradle
similarity index 77%
rename from jvm-libs/core/domain-models/build.gradle
rename to jvm-libs/linea/core/domain-models/build.gradle
index bda270181..215e5cf54 100644
--- a/jvm-libs/core/domain-models/build.gradle
+++ b/jvm-libs/linea/core/domain-models/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation project(":jvm-libs:kotlin-extensions")
+  implementation project(":jvm-libs:generic:extensions:kotlin")
   implementation "org.apache.tuweni:tuweni-units:${libs.versions.tuweni.get()}"
 }
 
diff --git a/jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt
similarity index 100%
rename from jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt
rename to jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockNumberAndHash.kt
diff --git a/jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt
similarity index 100%
rename from jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt
rename to jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/BlockParameter.kt
diff --git a/jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt
similarity index 100%
rename from jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt
rename to jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/CommonDomainFunctions.kt
diff --git a/jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt
similarity index 100%
rename from jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt
rename to jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/Constants.kt
diff --git a/jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt b/jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt
similarity index 100%
rename from jvm-libs/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt
rename to jvm-libs/linea/core/domain-models/src/main/kotlin/net/consensys/linea/FeeHistory.kt
diff --git a/jvm-libs/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt b/jvm-libs/linea/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt
similarity index 100%
rename from jvm-libs/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt
rename to jvm-libs/linea/core/domain-models/src/test/kotlin/net/consensys/linea/FeeHistoryTest.kt
diff --git a/jvm-libs/core/long-running-service/build.gradle b/jvm-libs/linea/core/long-running-service/build.gradle
similarity index 100%
rename from jvm-libs/core/long-running-service/build.gradle
rename to jvm-libs/linea/core/long-running-service/build.gradle
diff --git a/jvm-libs/core/long-running-service/src/main/kotlin/net/consensys/zkevm/LongRunningService.kt b/jvm-libs/linea/core/long-running-service/src/main/kotlin/net/consensys/zkevm/LongRunningService.kt
similarity index 100%
rename from jvm-libs/core/long-running-service/src/main/kotlin/net/consensys/zkevm/LongRunningService.kt
rename to jvm-libs/linea/core/long-running-service/src/main/kotlin/net/consensys/zkevm/LongRunningService.kt
diff --git a/jvm-libs/core/long-running-service/src/main/kotlin/net/consensys/zkevm/PeriodicPollingService.kt b/jvm-libs/linea/core/long-running-service/src/main/kotlin/net/consensys/zkevm/PeriodicPollingService.kt
similarity index 100%
rename from jvm-libs/core/long-running-service/src/main/kotlin/net/consensys/zkevm/PeriodicPollingService.kt
rename to jvm-libs/linea/core/long-running-service/src/main/kotlin/net/consensys/zkevm/PeriodicPollingService.kt
diff --git a/jvm-libs/core/long-running-service/src/test/kotlin/net/consensys/zkevm/PeriodicPollingServiceTest.kt b/jvm-libs/linea/core/long-running-service/src/test/kotlin/net/consensys/zkevm/PeriodicPollingServiceTest.kt
similarity index 100%
rename from jvm-libs/core/long-running-service/src/test/kotlin/net/consensys/zkevm/PeriodicPollingServiceTest.kt
rename to jvm-libs/linea/core/long-running-service/src/test/kotlin/net/consensys/zkevm/PeriodicPollingServiceTest.kt
diff --git a/jvm-libs/core/metrics/build.gradle b/jvm-libs/linea/core/metrics/build.gradle
similarity index 100%
rename from jvm-libs/core/metrics/build.gradle
rename to jvm-libs/linea/core/metrics/build.gradle
diff --git a/jvm-libs/core/metrics/src/main/kotlin/net/consensys/linea/metrics/MetricsFacade.kt b/jvm-libs/linea/core/metrics/src/main/kotlin/net/consensys/linea/metrics/MetricsFacade.kt
similarity index 100%
rename from jvm-libs/core/metrics/src/main/kotlin/net/consensys/linea/metrics/MetricsFacade.kt
rename to jvm-libs/linea/core/metrics/src/main/kotlin/net/consensys/linea/metrics/MetricsFacade.kt
diff --git a/jvm-libs/traces/build.gradle b/jvm-libs/linea/core/traces/build.gradle
similarity index 76%
rename from jvm-libs/traces/build.gradle
rename to jvm-libs/linea/core/traces/build.gradle
index 6ca8fd6e3..ec8a39901 100644
--- a/jvm-libs/traces/build.gradle
+++ b/jvm-libs/linea/core/traces/build.gradle
@@ -5,7 +5,8 @@ plugins {
 
 dependencies {
   implementation "org.apache.tuweni:tuweni-units:${libs.versions.tuweni.get()}"
-  implementation project(':jvm-libs:kotlin-extensions')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  testImplementation project(':jvm-libs:linea:testing:file-system')
   testImplementation "com.sksamuel.hoplite:hoplite-core:${libs.versions.hoplite.get()}"
   testImplementation "com.sksamuel.hoplite:hoplite-toml:${libs.versions.hoplite.get()}"
 }
diff --git a/jvm-libs/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt b/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt
similarity index 100%
rename from jvm-libs/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt
rename to jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesCounters.kt
diff --git a/jvm-libs/traces/src/main/kotlin/net/consensys/linea/traces/TracesFiles.kt b/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesFiles.kt
similarity index 100%
rename from jvm-libs/traces/src/main/kotlin/net/consensys/linea/traces/TracesFiles.kt
rename to jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracesFiles.kt
diff --git a/jvm-libs/traces/src/main/kotlin/net/consensys/linea/traces/TracingModule.kt b/jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracingModule.kt
similarity index 100%
rename from jvm-libs/traces/src/main/kotlin/net/consensys/linea/traces/TracingModule.kt
rename to jvm-libs/linea/core/traces/src/main/kotlin/net/consensys/linea/traces/TracingModule.kt
diff --git a/jvm-libs/traces/src/test/kotlin/net/consensys/linea/traces/TracesCountersTest.kt b/jvm-libs/linea/core/traces/src/test/kotlin/net/consensys/linea/traces/TracesCountersTest.kt
similarity index 94%
rename from jvm-libs/traces/src/test/kotlin/net/consensys/linea/traces/TracesCountersTest.kt
rename to jvm-libs/linea/core/traces/src/test/kotlin/net/consensys/linea/traces/TracesCountersTest.kt
index 0b65a9b47..3880b947c 100644
--- a/jvm-libs/traces/src/test/kotlin/net/consensys/linea/traces/TracesCountersTest.kt
+++ b/jvm-libs/linea/core/traces/src/test/kotlin/net/consensys/linea/traces/TracesCountersTest.kt
@@ -2,12 +2,12 @@ package net.consensys.linea.traces
 
 import com.sksamuel.hoplite.ConfigLoaderBuilder
 import com.sksamuel.hoplite.addFileSource
+import net.consensys.linea.testing.filesystem.findPathTo
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import java.lang.IllegalArgumentException
-import java.nio.file.Path
 
 class TracesCountersTest {
   data class TracesConfigV1(val tracesLimits: Map<TracingModuleV1, UInt>)
@@ -15,10 +15,7 @@ class TracesCountersTest {
 
   @Test
   fun `configs v1 match specifiedModules`() {
-    val path = Path.of(System.getProperty("user.dir"))
-      .parent
-      .parent
-      .resolve("config/common/traces-limits-v1.toml")
+    val path = findPathTo("config/common/traces-limits-v1.toml")
 
     val tracesConfigV1 = ConfigLoaderBuilder.default()
       .addFileSource(path.toString())
@@ -40,10 +37,7 @@ class TracesCountersTest {
 
   @Test
   fun `configs v2 match specifiedModules`() {
-    val path = Path.of(System.getProperty("user.dir"))
-      .parent
-      .parent
-      .resolve("config/common/traces-limits-v2.toml")
+    val path = findPathTo("config/common/traces-limits-v2.toml")
 
     val tracesConfig = ConfigLoaderBuilder.default()
       .addFileSource(path.toString())
diff --git a/jvm-libs/traces/src/testFixtures/kotlin/net/consensys/linea/traces/EvmTracesTestHelper.kt b/jvm-libs/linea/core/traces/src/testFixtures/kotlin/net/consensys/linea/traces/EvmTracesTestHelper.kt
similarity index 100%
rename from jvm-libs/traces/src/testFixtures/kotlin/net/consensys/linea/traces/EvmTracesTestHelper.kt
rename to jvm-libs/linea/core/traces/src/testFixtures/kotlin/net/consensys/linea/traces/EvmTracesTestHelper.kt
diff --git a/jvm-libs/linea-contracts/l1-rollup/build.gradle b/jvm-libs/linea/linea-contracts/l1-rollup/build.gradle
similarity index 100%
rename from jvm-libs/linea-contracts/l1-rollup/build.gradle
rename to jvm-libs/linea/linea-contracts/l1-rollup/build.gradle
diff --git a/jvm-libs/linea-contracts/l2-message-service/build.gradle b/jvm-libs/linea/linea-contracts/l2-message-service/build.gradle
similarity index 100%
rename from jvm-libs/linea-contracts/l2-message-service/build.gradle
rename to jvm-libs/linea/linea-contracts/l2-message-service/build.gradle
diff --git a/jvm-libs/metrics/micrometer/build.gradle b/jvm-libs/linea/metrics/micrometer/build.gradle
similarity index 68%
rename from jvm-libs/metrics/micrometer/build.gradle
rename to jvm-libs/linea/metrics/micrometer/build.gradle
index d154e6ac7..416c4febf 100644
--- a/jvm-libs/metrics/micrometer/build.gradle
+++ b/jvm-libs/linea/metrics/micrometer/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
   api "io.vertx:vertx-micrometer-metrics"
-  implementation project(':jvm-libs:core:metrics')
+  implementation project(':jvm-libs:linea:core:metrics')
 }
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/AbstractTimerCapture.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/AbstractTimerCapture.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/AbstractTimerCapture.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/AbstractTimerCapture.kt
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCapture.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCapture.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCapture.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCapture.kt
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregator.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregator.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregator.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregator.kt
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerCounterAdapter.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerCounterAdapter.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerCounterAdapter.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerCounterAdapter.kt
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacade.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacade.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacade.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacade.kt
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCapture.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCapture.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCapture.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCapture.kt
diff --git a/jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/Utils.kt b/jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/Utils.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/Utils.kt
rename to jvm-libs/linea/metrics/micrometer/src/main/kotlin/net/consensys/linea/metrics/micrometer/Utils.kt
diff --git a/jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCaptureTest.kt b/jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCaptureTest.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCaptureTest.kt
rename to jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/DynamicTagTimerCaptureTest.kt
diff --git a/jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregatorTest.kt b/jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregatorTest.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregatorTest.kt
rename to jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/GaugeAggregatorTest.kt
diff --git a/jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacadeTest.kt b/jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacadeTest.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacadeTest.kt
rename to jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/MicrometerMetricsFacadeTest.kt
diff --git a/jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCaptureTest.kt b/jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCaptureTest.kt
similarity index 100%
rename from jvm-libs/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCaptureTest.kt
rename to jvm-libs/linea/metrics/micrometer/src/test/kotlin/net/consensys/linea/metrics/micrometer/SimpleTimerCaptureTest.kt
diff --git a/jvm-libs/teku-execution-client/build.gradle b/jvm-libs/linea/teku-execution-client/build.gradle
similarity index 100%
rename from jvm-libs/teku-execution-client/build.gradle
rename to jvm-libs/linea/teku-execution-client/build.gradle
diff --git a/jvm-libs/testing/file-system/build.gradle b/jvm-libs/linea/testing/file-system/build.gradle
similarity index 54%
rename from jvm-libs/testing/file-system/build.gradle
rename to jvm-libs/linea/testing/file-system/build.gradle
index 15bdaad2a..ee09faaac 100644
--- a/jvm-libs/testing/file-system/build.gradle
+++ b/jvm-libs/linea/testing/file-system/build.gradle
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-  testImplementation(project(':jvm-libs:kotlin-extensions'))
+  testImplementation(project(':jvm-libs:generic:extensions:kotlin'))
 }
diff --git a/jvm-libs/testing/file-system/src/main/kotlin/net/consensys/linea/testing/filesystem/Files.kt b/jvm-libs/linea/testing/file-system/src/main/kotlin/net/consensys/linea/testing/filesystem/Files.kt
similarity index 100%
rename from jvm-libs/testing/file-system/src/main/kotlin/net/consensys/linea/testing/filesystem/Files.kt
rename to jvm-libs/linea/testing/file-system/src/main/kotlin/net/consensys/linea/testing/filesystem/Files.kt
diff --git a/jvm-libs/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt b/jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt
similarity index 90%
rename from jvm-libs/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt
rename to jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt
index 643ed1737..2023ad822 100644
--- a/jvm-libs/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt
+++ b/jvm-libs/linea/testing/file-system/src/test/kotlin/net/consensys/linea/testing/filesystem/FilesTest.kt
@@ -10,7 +10,7 @@ class FilesTest {
   fun `when file exists shall return path to it`() {
     val file = findPathTo("build.gradle")
     assertThat(file).isNotNull
-    assertThat(file.toString()).contains("jvm-libs/testing/file-system")
+    assertThat(file.toString()).contains("file-system/build.gradle")
 
     assertThat(findPathTo("settings.gradle", lookupParentDir = false)).isNull()
     assertThat(findPathTo("settings.gradle", lookupParentDir = true)).exists()
diff --git a/jvm-libs/testing/l1-blob-and-proof-submission/build.gradle b/jvm-libs/linea/testing/l1-blob-and-proof-submission/build.gradle
similarity index 54%
rename from jvm-libs/testing/l1-blob-and-proof-submission/build.gradle
rename to jvm-libs/linea/testing/l1-blob-and-proof-submission/build.gradle
index 76f1acb79..3e2ec1d22 100644
--- a/jvm-libs/testing/l1-blob-and-proof-submission/build.gradle
+++ b/jvm-libs/linea/testing/l1-blob-and-proof-submission/build.gradle
@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-  api(project(':jvm-libs:core:domain-models'))
-  implementation(project(':jvm-libs:kotlin-extensions'))
-  implementation(project(':jvm-libs:testing:file-system'))
+  api(project(':jvm-libs:linea:core:domain-models'))
+  implementation(project(':jvm-libs:generic:extensions:kotlin'))
+  implementation(project(':jvm-libs:linea:testing:file-system'))
   implementation(project(':coordinator:clients:prover-client:serialization'))
   implementation(testFixtures(project(":coordinator:core")))
 }
diff --git a/jvm-libs/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/ProverResponsesFileLoader.kt b/jvm-libs/linea/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/ProverResponsesFileLoader.kt
similarity index 100%
rename from jvm-libs/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/ProverResponsesFileLoader.kt
rename to jvm-libs/linea/testing/l1-blob-and-proof-submission/src/main/kotlin/net/consensys/linea/testing/submission/ProverResponsesFileLoader.kt
diff --git a/jvm-libs/testing-teku-helper/build.gradle b/jvm-libs/linea/testing/teku-helper/build.gradle
similarity index 87%
rename from jvm-libs/testing-teku-helper/build.gradle
rename to jvm-libs/linea/testing/teku-helper/build.gradle
index 772211974..9fac0d672 100644
--- a/jvm-libs/testing-teku-helper/build.gradle
+++ b/jvm-libs/linea/testing/teku-helper/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api project(":jvm-libs:teku-execution-client")
+  api project(":jvm-libs:linea:teku-execution-client")
   api "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
   api "tech.pegasys.teku.internal:bytes:${libs.versions.teku.get()}"
 
diff --git a/jvm-libs/testing-teku-helper/src/main/kotlin/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV1.kt b/jvm-libs/linea/testing/teku-helper/src/main/kotlin/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV1.kt
similarity index 100%
rename from jvm-libs/testing-teku-helper/src/main/kotlin/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV1.kt
rename to jvm-libs/linea/testing/teku-helper/src/main/kotlin/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV1.kt
diff --git a/jvm-libs/web3j-extensions/build.gradle b/jvm-libs/linea/web3j-extensions/build.gradle
similarity index 89%
rename from jvm-libs/web3j-extensions/build.gradle
rename to jvm-libs/linea/web3j-extensions/build.gradle
index 1eed8433c..2ef4ddaf0 100644
--- a/jvm-libs/web3j-extensions/build.gradle
+++ b/jvm-libs/linea/web3j-extensions/build.gradle
@@ -5,13 +5,13 @@ plugins {
 
 dependencies {
   api "org.web3j:core:${libs.versions.web3j.get()}"
-  api project(':jvm-libs:core:domain-models')
-  api project(':jvm-libs:logging')
+  api project(':jvm-libs:linea:core:domain-models')
+  api project(':jvm-libs:generic:logging')
   // For domain mappers
-  implementation project(":jvm-libs:kotlin-extensions")
+  implementation project(":jvm-libs:generic:extensions:kotlin")
   implementation "tech.pegasys.teku.internal:jackson:${libs.versions.teku.get()}"
   // Returned by domain mapper
-  api project(":jvm-libs:teku-execution-client")
+  api project(":jvm-libs:linea:teku-execution-client")
   implementation "tech.pegasys.teku.internal:unsigned:${libs.versions.teku.get()}"
   implementation "org.hyperledger.besu:besu-datatypes:${libs.versions.besu.get()}"
   implementation "org.hyperledger.besu:evm:${libs.versions.besu.get()}"
diff --git a/jvm-libs/web3j-extensions/src/integrationTest/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtendedIntTest.kt b/jvm-libs/linea/web3j-extensions/src/integrationTest/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtendedIntTest.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/integrationTest/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtendedIntTest.kt
rename to jvm-libs/linea/web3j-extensions/src/integrationTest/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtendedIntTest.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/AtomicContractEIP1559GasProvider.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/AtomicContractEIP1559GasProvider.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/AtomicContractEIP1559GasProvider.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/AtomicContractEIP1559GasProvider.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Blob.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/DomainObjectMappers.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/DomainObjectMappers.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/DomainObjectMappers.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/DomainObjectMappers.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EIP4844GasProvider.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EIP4844GasProvider.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EIP4844GasProvider.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EIP4844GasProvider.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Eip4844EthCall.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Eip4844EthCall.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Eip4844EthCall.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/Eip4844EthCall.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthCallWithInformativeReverts.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthCallWithInformativeReverts.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthCallWithInformativeReverts.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthCallWithInformativeReverts.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/EthFeeHistoryBlobExtended.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/ExtendedWeb3J.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/FeeHistoryExtensions.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/OkHttpClientLogging.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/OkHttpClientLogging.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/OkHttpClientLogging.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/OkHttpClientLogging.kt
diff --git a/jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/TransactionCount.kt b/jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/TransactionCount.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/TransactionCount.kt
rename to jvm-libs/linea/web3j-extensions/src/main/kotlin/net/consensys/linea/web3j/TransactionCount.kt
diff --git a/jvm-libs/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/DomainObjectMappersTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/DomainObjectMappersTest.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/DomainObjectMappersTest.kt
rename to jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/DomainObjectMappersTest.kt
diff --git a/jvm-libs/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt
rename to jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/Eip4844TransactionTest.kt
diff --git a/jvm-libs/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt b/jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt
similarity index 100%
rename from jvm-libs/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt
rename to jvm-libs/linea/web3j-extensions/src/test/kotlin/net/consensys/linea/web3j/FeeHistoryExtensionsTest.kt
diff --git a/settings.gradle b/settings.gradle
index 73082e51f..ac0074033 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,27 +1,29 @@
 rootProject.name = 'linea'
 
-include 'jvm-libs:errors'
-include 'jvm-libs:http-rest'
-include 'jvm-libs:kotlin-extensions'
-include 'jvm-libs:logging'
-include 'jvm-libs:testing-teku-helper'
-include 'jvm-libs:web3j-extensions'
-include 'jvm-libs:blob-compressor'
-include 'jvm-libs:blob-shnarf-calculator'
-include 'jvm-libs:future-extensions'
-include 'jvm-libs:json-rpc'
-include 'jvm-libs:traces'
-include 'jvm-libs:vertx-helper'
-include 'jvm-libs:core:domain-models'
-include 'jvm-libs:core:metrics'
-include 'jvm-libs:core:long-running-service'
-include 'jvm-libs:linea-contracts:l1-rollup'
-include 'jvm-libs:linea-contracts:l2-message-service'
-include 'jvm-libs:metrics:micrometer'
-include 'jvm-libs:teku-execution-client'
-include 'jvm-libs:testing:l1-blob-and-proof-submission'
-include 'jvm-libs:testing:file-system'
 include 'jvm-libs:generic:serialization:jackson'
+include 'jvm-libs:generic:json-rpc'
+include 'jvm-libs:generic:http-rest'
+include 'jvm-libs:generic:extensions:kotlin'
+include 'jvm-libs:generic:logging'
+include 'jvm-libs:generic:vertx-helper'
+include 'jvm-libs:generic:extensions:futures'
+include 'jvm-libs:generic:errors'
+
+include 'jvm-libs:linea:core:domain-models'
+include 'jvm-libs:linea:core:metrics'
+include 'jvm-libs:linea:core:traces'
+include 'jvm-libs:linea:web3j-extensions'
+include 'jvm-libs:linea:blob-compressor'
+include 'jvm-libs:linea:blob-shnarf-calculator'
+include 'jvm-libs:linea:core:long-running-service'
+include 'jvm-libs:linea:linea-contracts:l1-rollup'
+include 'jvm-libs:linea:linea-contracts:l2-message-service'
+include 'jvm-libs:linea:metrics:micrometer'
+include 'jvm-libs:linea:teku-execution-client'
+include 'jvm-libs:linea:testing:l1-blob-and-proof-submission'
+include 'jvm-libs:linea:testing:teku-helper'
+include 'jvm-libs:linea:testing:file-system'
+
 include 'coordinator:app'
 include 'coordinator:core'
 include 'coordinator:utilities'
diff --git a/testing-tools/app/build.gradle b/testing-tools/app/build.gradle
index 1a8178e2a..326595f21 100644
--- a/testing-tools/app/build.gradle
+++ b/testing-tools/app/build.gradle
@@ -22,7 +22,7 @@ application {
 }
 
 dependencies {
-  implementation project(':jvm-libs:core:domain-models')
+  implementation project(':jvm-libs:linea:core:domain-models')
   implementation "org.openapitools:openapi-generator-gradle-plugin:5.4.0"
   implementation 'commons-cli:commons-cli:1.6.0'
   implementation "org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0"
diff --git a/traces-api-facade/app/build.gradle b/traces-api-facade/app/build.gradle
index f35959eb1..43d5a42cd 100644
--- a/traces-api-facade/app/build.gradle
+++ b/traces-api-facade/app/build.gradle
@@ -6,11 +6,11 @@ plugins {
 dependencies {
   implementation project(':traces-api-facade:conflation')
   implementation project(':traces-api-facade:core')
-  implementation project(':jvm-libs:json-rpc')
-  implementation project(':jvm-libs:metrics:micrometer')
-  implementation project(':jvm-libs:kotlin-extensions')
-  implementation project(':jvm-libs:future-extensions')
-  implementation project(':jvm-libs:vertx-helper')
+  implementation project(':jvm-libs:generic:json-rpc')
+  implementation project(':jvm-libs:linea:metrics:micrometer')
+  implementation project(':jvm-libs:generic:extensions:kotlin')
+  implementation project(':jvm-libs:generic:extensions:futures')
+  implementation project(':jvm-libs:generic:vertx-helper')
 
   implementation "com.github.ben-manes.caffeine:caffeine:${libs.versions.caffeine.get()}"
   implementation "io.vertx:vertx-core"
diff --git a/traces-api-facade/core/build.gradle b/traces-api-facade/core/build.gradle
index a29577401..f5816aa92 100644
--- a/traces-api-facade/core/build.gradle
+++ b/traces-api-facade/core/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api project(':jvm-libs:core:domain-models')
-    api project(':jvm-libs:traces')
+    api project(':jvm-libs:linea:core:domain-models')
+    api project(':jvm-libs:linea:core:traces')
     api "io.vertx:vertx-core"
 }
diff --git a/transaction-decoder-tool/build.gradle b/transaction-decoder-tool/build.gradle
index b91cd3387..b364298e3 100644
--- a/transaction-decoder-tool/build.gradle
+++ b/transaction-decoder-tool/build.gradle
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-  implementation project(":jvm-libs:teku-execution-client")
-  implementation project(':jvm-libs:web3j-extensions')
+  implementation project(":jvm-libs:linea:teku-execution-client")
+  implementation project(':jvm-libs:linea:web3j-extensions')
 }