diff --git a/src/client/embedded/bootstrap/Makefile b/src/client/embedded/bootstrap/Makefile
index 558a62599..349e2b4e9 100644
--- a/src/client/embedded/bootstrap/Makefile
+++ b/src/client/embedded/bootstrap/Makefile
@@ -33,7 +33,7 @@ WEBCLIENT_IMPLS := \
 
 SOURCE_DIRECTORIES := webclient/shared webclient/browser webclient
 
--include mining/Makefile
+-include baker/Makefile
 
 JS_IMPLS := \
   webclient/shared/webclient_proto_services.ml \
@@ -66,8 +66,8 @@ clean::
 	-rm -f webclient/webclient_proto_static.ml
 	-rm -f webclient/*/*.cm* webclient/*/*~ webclient/*/*.o webclient/*/*.a
 	-rm -f webclient/*/*.deps webclient/*/*.deps.byte
-	-rm -f mining/*.cm* mining/*~ mining/*.o mining/*.a
-	-rm -f mining/*.deps mining/*.deps.byte
+	-rm -f baker/*.cm* baker/*~ baker/*.o baker/*.a
+	-rm -f baker/*.deps baker/*.deps.byte
 
 .INTERMEDIATE: webclient/browser/main.byte
 
diff --git a/src/client/embedded/bootstrap/baker/Makefile b/src/client/embedded/bootstrap/baker/Makefile
new file mode 100644
index 000000000..afcaf002c
--- /dev/null
+++ b/src/client/embedded/bootstrap/baker/Makefile
@@ -0,0 +1,23 @@
+
+SOURCE_DIRECTORIES += baker
+
+CLIENT_INTFS += \
+  baker/client_mining_blocks.mli \
+  baker/client_mining_operations.mli \
+  baker/client_mining_endorsement.mli \
+  baker/client_mining_denunciation.mli \
+  baker/client_mining_revelation.mli \
+  baker/client_mining_forge.mli \
+  baker/client_mining_daemon.mli \
+  baker/client_mining_main.mli \
+
+CLIENT_IMPLS += \
+  baker/client_mining_blocks.ml \
+  baker/client_mining_operations.ml \
+  baker/client_mining_endorsement.ml \
+  baker/client_mining_denunciation.ml \
+  baker/client_mining_revelation.ml \
+  baker/client_mining_forge.ml \
+  baker/client_mining_daemon.ml \
+  baker/client_mining_main.ml \
+
diff --git a/src/client/embedded/bootstrap/mining/client_mining_blocks.ml b/src/client/embedded/bootstrap/baker/client_mining_blocks.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_blocks.ml
rename to src/client/embedded/bootstrap/baker/client_mining_blocks.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_blocks.mli b/src/client/embedded/bootstrap/baker/client_mining_blocks.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_blocks.mli
rename to src/client/embedded/bootstrap/baker/client_mining_blocks.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_daemon.ml b/src/client/embedded/bootstrap/baker/client_mining_daemon.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_daemon.ml
rename to src/client/embedded/bootstrap/baker/client_mining_daemon.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_daemon.mli b/src/client/embedded/bootstrap/baker/client_mining_daemon.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_daemon.mli
rename to src/client/embedded/bootstrap/baker/client_mining_daemon.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_denunciation.ml b/src/client/embedded/bootstrap/baker/client_mining_denunciation.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_denunciation.ml
rename to src/client/embedded/bootstrap/baker/client_mining_denunciation.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_denunciation.mli b/src/client/embedded/bootstrap/baker/client_mining_denunciation.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_denunciation.mli
rename to src/client/embedded/bootstrap/baker/client_mining_denunciation.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_endorsement.ml b/src/client/embedded/bootstrap/baker/client_mining_endorsement.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_endorsement.ml
rename to src/client/embedded/bootstrap/baker/client_mining_endorsement.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_endorsement.mli b/src/client/embedded/bootstrap/baker/client_mining_endorsement.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_endorsement.mli
rename to src/client/embedded/bootstrap/baker/client_mining_endorsement.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_forge.ml b/src/client/embedded/bootstrap/baker/client_mining_forge.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_forge.ml
rename to src/client/embedded/bootstrap/baker/client_mining_forge.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_forge.mli b/src/client/embedded/bootstrap/baker/client_mining_forge.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_forge.mli
rename to src/client/embedded/bootstrap/baker/client_mining_forge.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_main.ml b/src/client/embedded/bootstrap/baker/client_mining_main.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_main.ml
rename to src/client/embedded/bootstrap/baker/client_mining_main.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_main.mli b/src/client/embedded/bootstrap/baker/client_mining_main.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_main.mli
rename to src/client/embedded/bootstrap/baker/client_mining_main.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_operations.ml b/src/client/embedded/bootstrap/baker/client_mining_operations.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_operations.ml
rename to src/client/embedded/bootstrap/baker/client_mining_operations.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_operations.mli b/src/client/embedded/bootstrap/baker/client_mining_operations.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_operations.mli
rename to src/client/embedded/bootstrap/baker/client_mining_operations.mli
diff --git a/src/client/embedded/bootstrap/mining/client_mining_revelation.ml b/src/client/embedded/bootstrap/baker/client_mining_revelation.ml
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_revelation.ml
rename to src/client/embedded/bootstrap/baker/client_mining_revelation.ml
diff --git a/src/client/embedded/bootstrap/mining/client_mining_revelation.mli b/src/client/embedded/bootstrap/baker/client_mining_revelation.mli
similarity index 100%
rename from src/client/embedded/bootstrap/mining/client_mining_revelation.mli
rename to src/client/embedded/bootstrap/baker/client_mining_revelation.mli
diff --git a/src/client/embedded/bootstrap/mining/Makefile b/src/client/embedded/bootstrap/mining/Makefile
deleted file mode 100644
index d595477d1..000000000
--- a/src/client/embedded/bootstrap/mining/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-SOURCE_DIRECTORIES += mining
-
-CLIENT_INTFS += \
-  mining/client_mining_blocks.mli \
-  mining/client_mining_operations.mli \
-  mining/client_mining_endorsement.mli \
-  mining/client_mining_denunciation.mli \
-  mining/client_mining_revelation.mli \
-  mining/client_mining_forge.mli \
-  mining/client_mining_daemon.mli \
-  mining/client_mining_main.mli \
-
-CLIENT_IMPLS += \
-  mining/client_mining_blocks.ml \
-  mining/client_mining_operations.ml \
-  mining/client_mining_endorsement.ml \
-  mining/client_mining_denunciation.ml \
-  mining/client_mining_revelation.ml \
-  mining/client_mining_forge.ml \
-  mining/client_mining_daemon.ml \
-  mining/client_mining_main.ml \
-