diff --git a/src/proto_alpha/lib_baking/client_baking_blocks.ml b/src/proto_alpha/lib_delegate/client_baking_blocks.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_blocks.ml
rename to src/proto_alpha/lib_delegate/client_baking_blocks.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_blocks.mli b/src/proto_alpha/lib_delegate/client_baking_blocks.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_blocks.mli
rename to src/proto_alpha/lib_delegate/client_baking_blocks.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_denunciation.ml b/src/proto_alpha/lib_delegate/client_baking_denunciation.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_denunciation.ml
rename to src/proto_alpha/lib_delegate/client_baking_denunciation.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_denunciation.mli b/src/proto_alpha/lib_delegate/client_baking_denunciation.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_denunciation.mli
rename to src/proto_alpha/lib_delegate/client_baking_denunciation.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_endorsement.ml b/src/proto_alpha/lib_delegate/client_baking_endorsement.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_endorsement.ml
rename to src/proto_alpha/lib_delegate/client_baking_endorsement.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_endorsement.mli b/src/proto_alpha/lib_delegate/client_baking_endorsement.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_endorsement.mli
rename to src/proto_alpha/lib_delegate/client_baking_endorsement.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_forge.ml b/src/proto_alpha/lib_delegate/client_baking_forge.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_forge.ml
rename to src/proto_alpha/lib_delegate/client_baking_forge.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_forge.mli b/src/proto_alpha/lib_delegate/client_baking_forge.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_forge.mli
rename to src/proto_alpha/lib_delegate/client_baking_forge.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_lib.ml b/src/proto_alpha/lib_delegate/client_baking_lib.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_lib.ml
rename to src/proto_alpha/lib_delegate/client_baking_lib.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_lib.mli b/src/proto_alpha/lib_delegate/client_baking_lib.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_lib.mli
rename to src/proto_alpha/lib_delegate/client_baking_lib.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_nonces.ml b/src/proto_alpha/lib_delegate/client_baking_nonces.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_nonces.ml
rename to src/proto_alpha/lib_delegate/client_baking_nonces.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_nonces.mli b/src/proto_alpha/lib_delegate/client_baking_nonces.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_nonces.mli
rename to src/proto_alpha/lib_delegate/client_baking_nonces.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_operations.ml b/src/proto_alpha/lib_delegate/client_baking_operations.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_operations.ml
rename to src/proto_alpha/lib_delegate/client_baking_operations.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_operations.mli b/src/proto_alpha/lib_delegate/client_baking_operations.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_operations.mli
rename to src/proto_alpha/lib_delegate/client_baking_operations.mli
diff --git a/src/proto_alpha/lib_baking/client_baking_revelation.ml b/src/proto_alpha/lib_delegate/client_baking_revelation.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_revelation.ml
rename to src/proto_alpha/lib_delegate/client_baking_revelation.ml
diff --git a/src/proto_alpha/lib_baking/client_baking_revelation.mli b/src/proto_alpha/lib_delegate/client_baking_revelation.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_baking_revelation.mli
rename to src/proto_alpha/lib_delegate/client_baking_revelation.mli
diff --git a/src/proto_alpha/lib_baking/client_daemon.ml b/src/proto_alpha/lib_delegate/client_daemon.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/client_daemon.ml
rename to src/proto_alpha/lib_delegate/client_daemon.ml
diff --git a/src/proto_alpha/lib_baking/client_daemon.mli b/src/proto_alpha/lib_delegate/client_daemon.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/client_daemon.mli
rename to src/proto_alpha/lib_delegate/client_daemon.mli
diff --git a/src/proto_alpha/lib_baking/delegate_commands.ml b/src/proto_alpha/lib_delegate/delegate_commands.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/delegate_commands.ml
rename to src/proto_alpha/lib_delegate/delegate_commands.ml
diff --git a/src/proto_alpha/lib_baking/delegate_commands.mli b/src/proto_alpha/lib_delegate/delegate_commands.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/delegate_commands.mli
rename to src/proto_alpha/lib_delegate/delegate_commands.mli
diff --git a/src/proto_alpha/lib_baking/delegate_commands_registration.ml b/src/proto_alpha/lib_delegate/delegate_commands_registration.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/delegate_commands_registration.ml
rename to src/proto_alpha/lib_delegate/delegate_commands_registration.ml
diff --git a/src/proto_alpha/lib_baking/jbuild b/src/proto_alpha/lib_delegate/jbuild
similarity index 100%
rename from src/proto_alpha/lib_baking/jbuild
rename to src/proto_alpha/lib_delegate/jbuild
diff --git a/src/proto_alpha/lib_baking/test/jbuild b/src/proto_alpha/lib_delegate/test/jbuild
similarity index 100%
rename from src/proto_alpha/lib_baking/test/jbuild
rename to src/proto_alpha/lib_delegate/test/jbuild
diff --git a/src/proto_alpha/lib_baking/test/node_helpers.ml b/src/proto_alpha/lib_delegate/test/node_helpers.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/node_helpers.ml
rename to src/proto_alpha/lib_delegate/test/node_helpers.ml
diff --git a/src/proto_alpha/lib_baking/test/node_helpers.mli b/src/proto_alpha/lib_delegate/test/node_helpers.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/test/node_helpers.mli
rename to src/proto_alpha/lib_delegate/test/node_helpers.mli
diff --git a/src/proto_alpha/lib_baking/test/proto_alpha_helpers.ml b/src/proto_alpha/lib_delegate/test/proto_alpha_helpers.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/proto_alpha_helpers.ml
rename to src/proto_alpha/lib_delegate/test/proto_alpha_helpers.ml
diff --git a/src/proto_alpha/lib_baking/test/proto_alpha_helpers.mli b/src/proto_alpha/lib_delegate/test/proto_alpha_helpers.mli
similarity index 100%
rename from src/proto_alpha/lib_baking/test/proto_alpha_helpers.mli
rename to src/proto_alpha/lib_delegate/test/proto_alpha_helpers.mli
diff --git a/src/proto_alpha/lib_baking/test/test_endorsement.ml b/src/proto_alpha/lib_delegate/test/test_endorsement.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/test_endorsement.ml
rename to src/proto_alpha/lib_delegate/test/test_endorsement.ml
diff --git a/src/proto_alpha/lib_baking/test/test_michelson_parser.ml b/src/proto_alpha/lib_delegate/test/test_michelson_parser.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/test_michelson_parser.ml
rename to src/proto_alpha/lib_delegate/test/test_michelson_parser.ml
diff --git a/src/proto_alpha/lib_baking/test/test_origination.ml b/src/proto_alpha/lib_delegate/test/test_origination.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/test_origination.ml
rename to src/proto_alpha/lib_delegate/test/test_origination.ml
diff --git a/src/proto_alpha/lib_baking/test/test_rpc.ml b/src/proto_alpha/lib_delegate/test/test_rpc.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/test_rpc.ml
rename to src/proto_alpha/lib_delegate/test/test_rpc.ml
diff --git a/src/proto_alpha/lib_baking/test/test_transaction.ml b/src/proto_alpha/lib_delegate/test/test_transaction.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/test_transaction.ml
rename to src/proto_alpha/lib_delegate/test/test_transaction.ml
diff --git a/src/proto_alpha/lib_baking/test/test_vote.ml b/src/proto_alpha/lib_delegate/test/test_vote.ml
similarity index 100%
rename from src/proto_alpha/lib_baking/test/test_vote.ml
rename to src/proto_alpha/lib_delegate/test/test_vote.ml
diff --git a/src/proto_alpha/lib_baking/tezos-baking-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam
similarity index 100%
rename from src/proto_alpha/lib_baking/tezos-baking-alpha-commands.opam
rename to src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam
diff --git a/src/proto_alpha/lib_baking/tezos-baking-alpha.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam
similarity index 100%
rename from src/proto_alpha/lib_baking/tezos-baking-alpha.opam
rename to src/proto_alpha/lib_delegate/tezos-baking-alpha.opam