ekkolon · ekkolon · Mar 4, 2026 · Mar 4, 2026
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = ["minikv", "minikv-core"]
+members = ["crates/minikv", "crates/minikv-core"]
 
 [workspace.package]
 version = "0.1.0"
@@ -14,7 +14,7 @@ keywords = ["storage", "distributed", "leveldb", "object-store"]
 categories = ["database", "network-programming"]
 
 [workspace.dependencies]
-minikv-core = { path = "minikv-core" }
+minikv-core = { path = "crates/minikv-core" }
 
 thiserror = "2"
 tracing = "0.1"

diff --git a/docker-compose.yml → compose.yml b/docker-compose.yml → compose.yml
@@ -16,7 +16,7 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - ./config/nginx-frontend.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/nginx-frontend.conf:/etc/nginx/nginx.conf:ro
     depends_on:
       minikv:
         condition: service_started
@@ -33,7 +33,7 @@ services:
   minikv:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: docker/Dockerfile
       target: runtime
     image: minikv:local
     container_name: minikv
@@ -78,13 +78,13 @@ services:
   volume1:
     build:
       context: .
-      dockerfile: Dockerfile.volume
+      dockerfile: docker/Dockerfile.volume
     image: minikv-volume:local
     container_name: volume1
     ports:
       - "8001:8080" # localhost:8001 → volume1:8080 (matches --public-volumes[0])
     volumes:
-      - ./config/nginx-volume.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/nginx-volume.conf:/etc/nginx/nginx.conf:ro
       - volume1-data:/data
     networks:
       - minikv-net
@@ -102,13 +102,13 @@ services:
   volume2:
     build:
       context: .
-      dockerfile: Dockerfile.volume
+      dockerfile: docker/Dockerfile.volume
     image: minikv-volume:local
     container_name: volume2
     ports:
       - "8002:8080" # localhost:8002 → volume2:8080 (matches --public-volumes[1])
     volumes:
-      - ./config/nginx-volume.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/nginx-volume.conf:/etc/nginx/nginx.conf:ro
       - volume2-data:/data
     networks:
       - minikv-net
@@ -122,13 +122,13 @@ services:
   volume3:
     build:
       context: .
-      dockerfile: Dockerfile.volume
+      dockerfile: docker/Dockerfile.volume
     image: minikv-volume:local
     container_name: volume3
     ports:
       - "8003:8080" # localhost:8003 → volume3:8080 (matches --public-volumes[2])
     volumes:
-      - ./config/nginx-volume.conf:/etc/nginx/nginx.conf:ro
+      - ./nginx/nginx-volume.conf:/etc/nginx/nginx.conf:ro
       - volume3-data:/data
     networks:
       - minikv-net

diff --git a/minikv-core/Cargo.toml → crates/minikv-core/Cargo.toml b/minikv-core/Cargo.toml → crates/minikv-core/Cargo.toml
diff --git a/minikv-core/src/error.rs → crates/minikv-core/src/error.rs b/minikv-core/src/error.rs → crates/minikv-core/src/error.rs
diff --git a/minikv-core/src/hashing.rs → crates/minikv-core/src/hashing.rs b/minikv-core/src/hashing.rs → crates/minikv-core/src/hashing.rs
diff --git a/minikv-core/src/lib.rs → crates/minikv-core/src/lib.rs b/minikv-core/src/lib.rs → crates/minikv-core/src/lib.rs
diff --git a/minikv-core/src/locking.rs → crates/minikv-core/src/locking.rs b/minikv-core/src/locking.rs → crates/minikv-core/src/locking.rs
diff --git a/minikv-core/src/rebalance.rs → crates/minikv-core/src/rebalance.rs b/minikv-core/src/rebalance.rs → crates/minikv-core/src/rebalance.rs
diff --git a/minikv-core/src/rebuild.rs → crates/minikv-core/src/rebuild.rs b/minikv-core/src/rebuild.rs → crates/minikv-core/src/rebuild.rs
diff --git a/minikv-core/src/record.rs → crates/minikv-core/src/record.rs b/minikv-core/src/record.rs → crates/minikv-core/src/record.rs
diff --git a/minikv-core/src/replication.rs → crates/minikv-core/src/replication.rs b/minikv-core/src/replication.rs → crates/minikv-core/src/replication.rs
diff --git a/minikv-core/src/state.rs → crates/minikv-core/src/state.rs b/minikv-core/src/state.rs → crates/minikv-core/src/state.rs
diff --git a/minikv-core/src/storage/leveldb.rs → crates/minikv-core/src/storage/leveldb.rs b/minikv-core/src/storage/leveldb.rs → crates/minikv-core/src/storage/leveldb.rs
diff --git a/minikv-core/src/storage/mod.rs → crates/minikv-core/src/storage/mod.rs b/minikv-core/src/storage/mod.rs → crates/minikv-core/src/storage/mod.rs
diff --git a/minikv-core/src/volumes.rs → crates/minikv-core/src/volumes.rs b/minikv-core/src/volumes.rs → crates/minikv-core/src/volumes.rs
diff --git a/minikv-core/tests/hashing.rs → crates/minikv-core/tests/hashing.rs b/minikv-core/tests/hashing.rs → crates/minikv-core/tests/hashing.rs
diff --git a/minikv-core/tests/rebalance.rs → crates/minikv-core/tests/rebalance.rs b/minikv-core/tests/rebalance.rs → crates/minikv-core/tests/rebalance.rs
diff --git a/minikv-core/tests/record.rs → crates/minikv-core/tests/record.rs b/minikv-core/tests/record.rs → crates/minikv-core/tests/record.rs
diff --git a/minikv/Cargo.toml → crates/minikv/Cargo.toml b/minikv/Cargo.toml → crates/minikv/Cargo.toml
diff --git a/minikv/src/cli.rs → crates/minikv/src/cli.rs b/minikv/src/cli.rs → crates/minikv/src/cli.rs
diff --git a/minikv/src/error.rs → crates/minikv/src/error.rs b/minikv/src/error.rs → crates/minikv/src/error.rs
diff --git a/minikv/src/http/handlers.rs → crates/minikv/src/http/handlers.rs b/minikv/src/http/handlers.rs → crates/minikv/src/http/handlers.rs
diff --git a/minikv/src/http/mod.rs → crates/minikv/src/http/mod.rs b/minikv/src/http/mod.rs → crates/minikv/src/http/mod.rs
diff --git a/minikv/src/http/query.rs → crates/minikv/src/http/query.rs b/minikv/src/http/query.rs → crates/minikv/src/http/query.rs
diff --git a/minikv/src/http/s3.rs → crates/minikv/src/http/s3.rs b/minikv/src/http/s3.rs → crates/minikv/src/http/s3.rs
diff --git a/minikv/src/lib.rs → crates/minikv/src/lib.rs b/minikv/src/lib.rs → crates/minikv/src/lib.rs
diff --git a/minikv/src/main.rs → crates/minikv/src/main.rs b/minikv/src/main.rs → crates/minikv/src/main.rs
diff --git a/minikv/tests/integration.rs → crates/minikv/tests/integration.rs b/minikv/tests/integration.rs → crates/minikv/tests/integration.rs
diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
@@ -27,9 +27,9 @@ WORKDIR /build
 # -----------------------------------------------------------------------------
 FROM chef AS planner
 
+# Copy workspace manifests, preserving folder structure
 COPY Cargo.toml Cargo.lock ./
-COPY minikv ./minikv
-COPY minikv-core ./minikv-core
+COPY crates ./crates
 
 RUN cargo chef prepare --recipe-path recipe.json
 
@@ -48,10 +48,7 @@ COPY --from=planner /build/recipe.json recipe.json
 
 RUN cargo chef cook --release --recipe-path recipe.json
 
-COPY Cargo.toml Cargo.lock ./
-COPY minikv ./minikv
-COPY minikv-core ./minikv-core
-COPY config ./config
+COPY . .
 
 # Enforce strict compilation rules.
 ENV RUSTFLAGS="-D warnings -D unsafe_code"
@@ -75,7 +72,7 @@ LABEL org.opencontainers.image.licenses="MIT"
 COPY --from=builder /build/target/release/minikv /usr/local/bin/minikv
 
 # Copy nginx reference configuration (for operators).
-COPY --from=builder /build/config/nginx-volume.conf /etc/minikv/nginx-volume.conf
+COPY --from=builder /build/nginx/nginx-volume.conf /etc/minikv/nginx-volume.conf
 
 # Working directory for the metadata database.
 # This path must be mounted as a volume in production.

diff --git a/Dockerfile.volume → docker/Dockerfile.volume b/Dockerfile.volume → docker/Dockerfile.volume
diff --git a/config/nginx-frontend.conf → nginx/nginx-frontend.conf b/config/nginx-frontend.conf → nginx/nginx-frontend.conf
diff --git a/config/nginx-volume.conf → nginx/nginx-volume.conf b/config/nginx-volume.conf → nginx/nginx-volume.conf
diff --git a/volume → scripts/volume b/volume → scripts/volume