From 1f3c68cbd8d23e0b1b306658ac7f66382cbc3b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Mon, 22 Jan 2018 18:43:58 +0100
Subject: [PATCH] Refactor: Regroup protocols

---
 scripts/alphanet_constants.patch                            | 6 +++---
 src/lib_embedded_protocol_alpha/jbuild                      | 1 -
 src/lib_embedded_protocol_alpha/src/jbuild                  | 1 -
 src/lib_embedded_protocol_demo/jbuild                       | 1 -
 src/lib_embedded_protocol_demo/src/jbuild                   | 1 -
 src/lib_embedded_protocol_genesis/jbuild                    | 1 -
 src/lib_embedded_protocol_genesis/src/jbuild                | 1 -
 src/lib_protocol_compiler/jbuild_embedded_protocol_template | 2 +-
 src/lib_protocol_compiler/jbuild_protocol_template          | 4 ++--
 .../lib_client_alpha}/alpha.ml                              | 0
 .../lib_client_alpha}/alpha.mli                             | 0
 .../lib_client_alpha}/client_baking_blocks.ml               | 0
 .../lib_client_alpha}/client_baking_blocks.mli              | 0
 .../lib_client_alpha}/client_baking_daemon.ml               | 0
 .../lib_client_alpha}/client_baking_daemon.mli              | 0
 .../lib_client_alpha}/client_baking_denunciation.ml         | 0
 .../lib_client_alpha}/client_baking_denunciation.mli        | 0
 .../lib_client_alpha}/client_baking_endorsement.ml          | 0
 .../lib_client_alpha}/client_baking_endorsement.mli         | 0
 .../lib_client_alpha}/client_baking_forge.ml                | 0
 .../lib_client_alpha}/client_baking_forge.mli               | 0
 .../lib_client_alpha}/client_baking_lib.ml                  | 0
 .../lib_client_alpha}/client_baking_lib.mli                 | 0
 .../lib_client_alpha}/client_baking_main.ml                 | 0
 .../lib_client_alpha}/client_baking_main.mli                | 0
 .../lib_client_alpha}/client_baking_operations.ml           | 0
 .../lib_client_alpha}/client_baking_operations.mli          | 0
 .../lib_client_alpha}/client_baking_revelation.ml           | 0
 .../lib_client_alpha}/client_baking_revelation.mli          | 0
 .../lib_client_alpha}/client_proto_args.ml                  | 0
 .../lib_client_alpha}/client_proto_args.mli                 | 0
 .../lib_client_alpha}/client_proto_context.ml               | 0
 .../lib_client_alpha}/client_proto_context.mli              | 0
 .../lib_client_alpha}/client_proto_context_commands.ml      | 0
 .../lib_client_alpha}/client_proto_contracts.ml             | 0
 .../lib_client_alpha}/client_proto_contracts.mli            | 0
 .../lib_client_alpha}/client_proto_contracts_commands.ml    | 0
 .../lib_client_alpha}/client_proto_main.ml                  | 0
 .../lib_client_alpha}/client_proto_main.mli                 | 0
 .../lib_client_alpha}/client_proto_nonces.ml                | 0
 .../lib_client_alpha}/client_proto_nonces.mli               | 0
 .../lib_client_alpha}/client_proto_programs.ml              | 0
 .../lib_client_alpha}/client_proto_programs.mli             | 0
 .../lib_client_alpha}/client_proto_programs_commands.ml     | 0
 .../lib_client_alpha}/client_proto_programs_commands.mli    | 0
 .../lib_client_alpha}/client_proto_rpcs.ml                  | 0
 .../lib_client_alpha}/client_proto_rpcs.mli                 | 0
 .../lib_client_alpha}/jbuild                                | 0
 .../lib_client_alpha}/michelson_macros.ml                   | 0
 .../lib_client_alpha}/michelson_macros.mli                  | 0
 .../lib_client_alpha}/michelson_v1_emacs.ml                 | 0
 .../lib_client_alpha}/michelson_v1_emacs.mli                | 0
 .../lib_client_alpha}/michelson_v1_error_reporter.ml        | 0
 .../lib_client_alpha}/michelson_v1_error_reporter.mli       | 0
 .../lib_client_alpha}/michelson_v1_parser.ml                | 0
 .../lib_client_alpha}/michelson_v1_parser.mli               | 0
 .../lib_client_alpha}/michelson_v1_printer.ml               | 0
 .../lib_client_alpha}/michelson_v1_printer.mli              | 0
 .../lib_client_alpha}/tezos-embedded-client-alpha.opam      | 0
 src/proto_alpha/lib_protocol_alpha/jbuild                   | 1 +
 .../lib_protocol_alpha}/src/TEZOS_PROTOCOL                  | 0
 .../lib_protocol_alpha}/src/amendment.ml                    | 0
 .../lib_protocol_alpha}/src/amendment.mli                   | 0
 .../lib_protocol_alpha}/src/apply.ml                        | 0
 .../lib_protocol_alpha}/src/baking.ml                       | 0
 .../lib_protocol_alpha}/src/baking.mli                      | 0
 .../lib_protocol_alpha}/src/block_header_repr.ml            | 0
 .../lib_protocol_alpha}/src/block_header_repr.mli           | 0
 .../lib_protocol_alpha}/src/bootstrap_storage.ml            | 0
 .../lib_protocol_alpha}/src/bootstrap_storage.mli           | 0
 .../lib_protocol_alpha}/src/constants_repr.ml               | 0
 .../lib_protocol_alpha}/src/contract_repr.ml                | 0
 .../lib_protocol_alpha}/src/contract_repr.mli               | 0
 .../lib_protocol_alpha}/src/contract_storage.ml             | 0
 .../lib_protocol_alpha}/src/contract_storage.mli            | 0
 .../lib_protocol_alpha}/src/cycle_repr.ml                   | 0
 .../lib_protocol_alpha}/src/cycle_repr.mli                  | 0
 .../lib_protocol_alpha}/src/fitness_repr.ml                 | 0
 .../lib_protocol_alpha}/src/fitness_storage.ml              | 0
 .../lib_protocol_alpha}/src/gas.ml                          | 0
 .../lib_protocol_alpha}/src/gas.mli                         | 0
 .../lib_protocol_alpha}/src/init_storage.ml                 | 0
 src/proto_alpha/lib_protocol_alpha/src/jbuild               | 1 +
 .../lib_protocol_alpha}/src/level_repr.ml                   | 0
 .../lib_protocol_alpha}/src/level_repr.mli                  | 0
 .../lib_protocol_alpha}/src/level_storage.ml                | 0
 .../lib_protocol_alpha}/src/level_storage.mli               | 0
 .../lib_protocol_alpha}/src/main.ml                         | 0
 .../lib_protocol_alpha}/src/main.mli                        | 0
 .../lib_protocol_alpha}/src/manager_repr.ml                 | 0
 .../lib_protocol_alpha}/src/manager_repr.mli                | 0
 .../lib_protocol_alpha}/src/michelson_v1_primitives.ml      | 0
 .../lib_protocol_alpha}/src/michelson_v1_primitives.mli     | 0
 .../lib_protocol_alpha}/src/misc.ml                         | 0
 .../lib_protocol_alpha}/src/misc.mli                        | 0
 .../lib_protocol_alpha}/src/nonce_storage.ml                | 0
 .../lib_protocol_alpha}/src/nonce_storage.mli               | 0
 .../lib_protocol_alpha}/src/operation_repr.ml               | 0
 .../lib_protocol_alpha}/src/operation_repr.mli              | 0
 .../lib_protocol_alpha}/src/period_repr.ml                  | 0
 .../lib_protocol_alpha}/src/period_repr.mli                 | 0
 .../lib_protocol_alpha}/src/public_key_storage.ml           | 0
 .../lib_protocol_alpha}/src/public_key_storage.mli          | 0
 .../lib_protocol_alpha}/src/qty_repr.ml                     | 0
 .../lib_protocol_alpha}/src/raw_context.ml                  | 0
 .../lib_protocol_alpha}/src/raw_context.mli                 | 0
 .../lib_protocol_alpha}/src/raw_level_repr.ml               | 0
 .../lib_protocol_alpha}/src/raw_level_repr.mli              | 0
 .../lib_protocol_alpha}/src/reward_storage.ml               | 0
 .../lib_protocol_alpha}/src/reward_storage.mli              | 0
 .../lib_protocol_alpha}/src/roll_repr.ml                    | 0
 .../lib_protocol_alpha}/src/roll_repr.mli                   | 0
 .../lib_protocol_alpha}/src/roll_storage.ml                 | 0
 .../lib_protocol_alpha}/src/roll_storage.mli                | 0
 .../lib_protocol_alpha}/src/script_int_repr.ml              | 0
 .../lib_protocol_alpha}/src/script_int_repr.mli             | 0
 .../lib_protocol_alpha}/src/script_interpreter.ml           | 0
 .../lib_protocol_alpha}/src/script_interpreter.mli          | 0
 .../lib_protocol_alpha}/src/script_ir_translator.ml         | 0
 .../lib_protocol_alpha}/src/script_ir_translator.mli        | 0
 .../lib_protocol_alpha}/src/script_repr.ml                  | 0
 .../lib_protocol_alpha}/src/script_repr.mli                 | 0
 .../lib_protocol_alpha}/src/script_timestamp_repr.ml        | 0
 .../lib_protocol_alpha}/src/script_timestamp_repr.mli       | 0
 .../lib_protocol_alpha}/src/script_typed_ir.ml              | 0
 .../lib_protocol_alpha}/src/seed_repr.ml                    | 0
 .../lib_protocol_alpha}/src/seed_repr.mli                   | 0
 .../lib_protocol_alpha}/src/seed_storage.ml                 | 0
 .../lib_protocol_alpha}/src/seed_storage.mli                | 0
 .../lib_protocol_alpha}/src/services.ml                     | 0
 .../lib_protocol_alpha}/src/services_registration.ml        | 0
 .../lib_protocol_alpha}/src/storage.ml                      | 0
 .../lib_protocol_alpha}/src/storage.mli                     | 0
 .../lib_protocol_alpha}/src/storage_functors.ml             | 0
 .../lib_protocol_alpha}/src/storage_functors.mli            | 0
 .../lib_protocol_alpha}/src/storage_sigs.ml                 | 0
 .../lib_protocol_alpha}/src/tez_repr.ml                     | 0
 .../lib_protocol_alpha}/src/tez_repr.mli                    | 0
 .../lib_protocol_alpha}/src/tezos_context.ml                | 0
 .../lib_protocol_alpha}/src/tezos_context.mli               | 0
 .../lib_protocol_alpha}/src/tezos_hash.ml                   | 0
 .../lib_protocol_alpha}/src/time_repr.ml                    | 0
 .../lib_protocol_alpha}/src/time_repr.mli                   | 0
 .../lib_protocol_alpha}/src/vote_repr.ml                    | 0
 .../lib_protocol_alpha}/src/vote_repr.mli                   | 0
 .../lib_protocol_alpha}/src/vote_storage.ml                 | 0
 .../lib_protocol_alpha}/src/vote_storage.mli                | 0
 .../lib_protocol_alpha}/src/voting_period_repr.ml           | 0
 .../lib_protocol_alpha}/src/voting_period_repr.mli          | 0
 .../lib_protocol_alpha}/tezos-embedded-protocol-alpha.opam  | 0
 .../lib_protocol_alpha}/tezos-protocol-alpha.opam           | 0
 .../lib_client_demo}/client_proto_main.ml                   | 0
 .../lib_client_demo}/client_proto_main.mli                  | 0
 .../lib_client_demo}/client_proto_rpcs.ml                   | 0
 .../lib_client_demo}/client_proto_rpcs.mli                  | 0
 src/proto_demo/lib_protocol_demo/jbuild                     | 1 +
 .../lib_protocol_demo}/src/TEZOS_PROTOCOL                   | 0
 .../lib_protocol_demo}/src/error.ml                         | 0
 src/proto_demo/lib_protocol_demo/src/jbuild                 | 1 +
 .../lib_protocol_demo}/src/main.ml                          | 0
 .../lib_protocol_demo}/src/services.ml                      | 0
 .../lib_protocol_demo}/tezos-embedded-protocol-demo.opam    | 0
 .../lib_protocol_demo}/tezos-protocol-demo.opam             | 0
 .../lib_client_genesis}/client_proto_main.ml                | 0
 .../lib_client_genesis}/client_proto_main.mli               | 0
 .../lib_client_genesis}/jbuild                              | 0
 .../lib_client_genesis}/tezos-embedded-client-genesis.opam  | 0
 src/proto_genesis/lib_protocol_genesis/jbuild               | 1 +
 .../lib_protocol_genesis}/src/TEZOS_PROTOCOL                | 0
 .../lib_protocol_genesis}/src/data.ml                       | 0
 src/proto_genesis/lib_protocol_genesis/src/jbuild           | 1 +
 .../lib_protocol_genesis}/src/main.ml                       | 0
 .../lib_protocol_genesis}/src/services.ml                   | 0
 .../tezos-embedded-protocol-genesis.opam                    | 0
 .../lib_protocol_genesis}/tezos-protocol-genesis.opam       | 0
 175 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 120000 src/lib_embedded_protocol_alpha/jbuild
 delete mode 120000 src/lib_embedded_protocol_alpha/src/jbuild
 delete mode 120000 src/lib_embedded_protocol_demo/jbuild
 delete mode 120000 src/lib_embedded_protocol_demo/src/jbuild
 delete mode 120000 src/lib_embedded_protocol_genesis/jbuild
 delete mode 120000 src/lib_embedded_protocol_genesis/src/jbuild
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/alpha.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/alpha.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_blocks.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_blocks.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_daemon.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_daemon.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_denunciation.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_denunciation.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_endorsement.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_endorsement.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_forge.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_forge.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_lib.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_lib.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_main.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_main.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_operations.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_operations.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_revelation.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_baking_revelation.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_args.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_args.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_context.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_context.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_context_commands.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_contracts.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_contracts.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_contracts_commands.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_main.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_main.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_nonces.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_nonces.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_programs.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_programs.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_programs_commands.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_programs_commands.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_rpcs.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/client_proto_rpcs.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/jbuild (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_macros.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_macros.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_emacs.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_emacs.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_error_reporter.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_error_reporter.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_parser.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_parser.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_printer.ml (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/michelson_v1_printer.mli (100%)
 rename src/{lib_embedded_client_alpha => proto_alpha/lib_client_alpha}/tezos-embedded-client-alpha.opam (100%)
 create mode 120000 src/proto_alpha/lib_protocol_alpha/jbuild
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/TEZOS_PROTOCOL (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/amendment.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/amendment.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/apply.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/baking.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/baking.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/block_header_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/block_header_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/bootstrap_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/bootstrap_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/constants_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/contract_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/contract_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/contract_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/contract_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/cycle_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/cycle_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/fitness_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/fitness_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/gas.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/gas.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/init_storage.ml (100%)
 create mode 120000 src/proto_alpha/lib_protocol_alpha/src/jbuild
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/level_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/level_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/level_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/level_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/main.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/main.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/manager_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/manager_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/michelson_v1_primitives.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/michelson_v1_primitives.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/misc.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/misc.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/nonce_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/nonce_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/operation_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/operation_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/period_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/period_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/public_key_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/public_key_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/qty_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/raw_context.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/raw_context.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/raw_level_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/raw_level_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/reward_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/reward_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/roll_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/roll_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/roll_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/roll_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_int_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_int_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_interpreter.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_interpreter.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_ir_translator.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_ir_translator.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_timestamp_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_timestamp_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/script_typed_ir.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/seed_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/seed_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/seed_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/seed_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/services.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/services_registration.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/storage_functors.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/storage_functors.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/storage_sigs.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/tez_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/tez_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/tezos_context.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/tezos_context.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/tezos_hash.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/time_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/time_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/vote_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/vote_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/vote_storage.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/vote_storage.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/voting_period_repr.ml (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/src/voting_period_repr.mli (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/tezos-embedded-protocol-alpha.opam (100%)
 rename src/{lib_embedded_protocol_alpha => proto_alpha/lib_protocol_alpha}/tezos-protocol-alpha.opam (100%)
 rename src/{lib_embedded_client_demo => proto_demo/lib_client_demo}/client_proto_main.ml (100%)
 rename src/{lib_embedded_client_demo => proto_demo/lib_client_demo}/client_proto_main.mli (100%)
 rename src/{lib_embedded_client_demo => proto_demo/lib_client_demo}/client_proto_rpcs.ml (100%)
 rename src/{lib_embedded_client_demo => proto_demo/lib_client_demo}/client_proto_rpcs.mli (100%)
 create mode 120000 src/proto_demo/lib_protocol_demo/jbuild
 rename src/{lib_embedded_protocol_demo => proto_demo/lib_protocol_demo}/src/TEZOS_PROTOCOL (100%)
 rename src/{lib_embedded_protocol_demo => proto_demo/lib_protocol_demo}/src/error.ml (100%)
 create mode 120000 src/proto_demo/lib_protocol_demo/src/jbuild
 rename src/{lib_embedded_protocol_demo => proto_demo/lib_protocol_demo}/src/main.ml (100%)
 rename src/{lib_embedded_protocol_demo => proto_demo/lib_protocol_demo}/src/services.ml (100%)
 rename src/{lib_embedded_protocol_demo => proto_demo/lib_protocol_demo}/tezos-embedded-protocol-demo.opam (100%)
 rename src/{lib_embedded_protocol_demo => proto_demo/lib_protocol_demo}/tezos-protocol-demo.opam (100%)
 rename src/{lib_embedded_client_genesis => proto_genesis/lib_client_genesis}/client_proto_main.ml (100%)
 rename src/{lib_embedded_client_genesis => proto_genesis/lib_client_genesis}/client_proto_main.mli (100%)
 rename src/{lib_embedded_client_genesis => proto_genesis/lib_client_genesis}/jbuild (100%)
 rename src/{lib_embedded_client_genesis => proto_genesis/lib_client_genesis}/tezos-embedded-client-genesis.opam (100%)
 create mode 120000 src/proto_genesis/lib_protocol_genesis/jbuild
 rename src/{lib_embedded_protocol_genesis => proto_genesis/lib_protocol_genesis}/src/TEZOS_PROTOCOL (100%)
 rename src/{lib_embedded_protocol_genesis => proto_genesis/lib_protocol_genesis}/src/data.ml (100%)
 create mode 120000 src/proto_genesis/lib_protocol_genesis/src/jbuild
 rename src/{lib_embedded_protocol_genesis => proto_genesis/lib_protocol_genesis}/src/main.ml (100%)
 rename src/{lib_embedded_protocol_genesis => proto_genesis/lib_protocol_genesis}/src/services.ml (100%)
 rename src/{lib_embedded_protocol_genesis => proto_genesis/lib_protocol_genesis}/tezos-embedded-protocol-genesis.opam (100%)
 rename src/{lib_embedded_protocol_genesis => proto_genesis/lib_protocol_genesis}/tezos-protocol-genesis.opam (100%)

diff --git a/scripts/alphanet_constants.patch b/scripts/alphanet_constants.patch
index 726ebb888..64b54eac2 100644
--- a/scripts/alphanet_constants.patch
+++ b/scripts/alphanet_constants.patch
@@ -1,7 +1,7 @@
-diff --git a/src/lib_embedded_protocol_alpha/src/constants_repr.ml b/src/lib_embedded_protocol_alpha/src/constants_repr.ml
+diff --git a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
 index 61e79c8a..f91ce282 100644
---- a/src/lib_embedded_protocol_alpha/src/constants_repr.ml
-+++ b/src/lib_embedded_protocol_alpha/src/constants_repr.ml
+--- a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
++++ b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
 @@ -49,15 +49,14 @@ let read_public_key s =
    Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s))
  
diff --git a/src/lib_embedded_protocol_alpha/jbuild b/src/lib_embedded_protocol_alpha/jbuild
deleted file mode 120000
index b07d3e876..000000000
--- a/src/lib_embedded_protocol_alpha/jbuild
+++ /dev/null
@@ -1 +0,0 @@
-../lib_protocol_compiler/jbuild_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_alpha/src/jbuild b/src/lib_embedded_protocol_alpha/src/jbuild
deleted file mode 120000
index 416ee606d..000000000
--- a/src/lib_embedded_protocol_alpha/src/jbuild
+++ /dev/null
@@ -1 +0,0 @@
-../../lib_protocol_compiler/jbuild_embedded_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_demo/jbuild b/src/lib_embedded_protocol_demo/jbuild
deleted file mode 120000
index b07d3e876..000000000
--- a/src/lib_embedded_protocol_demo/jbuild
+++ /dev/null
@@ -1 +0,0 @@
-../lib_protocol_compiler/jbuild_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_demo/src/jbuild b/src/lib_embedded_protocol_demo/src/jbuild
deleted file mode 120000
index 416ee606d..000000000
--- a/src/lib_embedded_protocol_demo/src/jbuild
+++ /dev/null
@@ -1 +0,0 @@
-../../lib_protocol_compiler/jbuild_embedded_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_genesis/jbuild b/src/lib_embedded_protocol_genesis/jbuild
deleted file mode 120000
index b07d3e876..000000000
--- a/src/lib_embedded_protocol_genesis/jbuild
+++ /dev/null
@@ -1 +0,0 @@
-../lib_protocol_compiler/jbuild_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_genesis/src/jbuild b/src/lib_embedded_protocol_genesis/src/jbuild
deleted file mode 120000
index 416ee606d..000000000
--- a/src/lib_embedded_protocol_genesis/src/jbuild
+++ /dev/null
@@ -1 +0,0 @@
-../../lib_protocol_compiler/jbuild_embedded_protocol_template
\ No newline at end of file
diff --git a/src/lib_protocol_compiler/jbuild_embedded_protocol_template b/src/lib_protocol_compiler/jbuild_embedded_protocol_template
index 9ce7c7587..08449bc9b 100644
--- a/src/lib_protocol_compiler/jbuild_embedded_protocol_template
+++ b/src/lib_protocol_compiler/jbuild_embedded_protocol_template
@@ -1,6 +1,6 @@
 (* -*- tuareg -*- *)
 
-let prefix = "lib_embedded_protocol_"
+let prefix = "lib_protocol_"
 let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd ()
 
 let predefined_version = None (* to be substituted in opam packages *)
diff --git a/src/lib_protocol_compiler/jbuild_protocol_template b/src/lib_protocol_compiler/jbuild_protocol_template
index 12df7c31d..b80125bbb 100644
--- a/src/lib_protocol_compiler/jbuild_protocol_template
+++ b/src/lib_protocol_compiler/jbuild_protocol_template
@@ -11,7 +11,7 @@
 
 #require "unix"
 
-let prefix = "lib_embedded_protocol_"
+let prefix = "lib_protocol_"
 let dirname = Filename.basename @@ Sys.getcwd ()
 
 let predefined_version = None (* to be substituted in opam packages *)
@@ -28,7 +28,7 @@ let version =
 
 let path =
   match predefined_version with
-  | None -> "src/lib_embedded_protocol_" ^ version
+  | None -> "src/proto_" ^ version ^ "/lib_protocol_" ^ version
   | Some _ -> "."
 
 let sources =
diff --git a/src/lib_embedded_client_alpha/alpha.ml b/src/proto_alpha/lib_client_alpha/alpha.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/alpha.ml
rename to src/proto_alpha/lib_client_alpha/alpha.ml
diff --git a/src/lib_embedded_client_alpha/alpha.mli b/src/proto_alpha/lib_client_alpha/alpha.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/alpha.mli
rename to src/proto_alpha/lib_client_alpha/alpha.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_blocks.ml b/src/proto_alpha/lib_client_alpha/client_baking_blocks.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_blocks.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_blocks.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_blocks.mli b/src/proto_alpha/lib_client_alpha/client_baking_blocks.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_blocks.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_blocks.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_daemon.ml b/src/proto_alpha/lib_client_alpha/client_baking_daemon.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_daemon.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_daemon.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_daemon.mli b/src/proto_alpha/lib_client_alpha/client_baking_daemon.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_daemon.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_daemon.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_denunciation.ml b/src/proto_alpha/lib_client_alpha/client_baking_denunciation.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_denunciation.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_denunciation.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_denunciation.mli b/src/proto_alpha/lib_client_alpha/client_baking_denunciation.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_denunciation.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_denunciation.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_endorsement.ml b/src/proto_alpha/lib_client_alpha/client_baking_endorsement.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_endorsement.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_endorsement.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_endorsement.mli b/src/proto_alpha/lib_client_alpha/client_baking_endorsement.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_endorsement.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_endorsement.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_forge.ml b/src/proto_alpha/lib_client_alpha/client_baking_forge.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_forge.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_forge.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_forge.mli b/src/proto_alpha/lib_client_alpha/client_baking_forge.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_forge.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_forge.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_lib.ml b/src/proto_alpha/lib_client_alpha/client_baking_lib.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_lib.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_lib.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_lib.mli b/src/proto_alpha/lib_client_alpha/client_baking_lib.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_lib.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_lib.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_main.ml b/src/proto_alpha/lib_client_alpha/client_baking_main.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_main.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_main.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_main.mli b/src/proto_alpha/lib_client_alpha/client_baking_main.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_main.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_main.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_operations.ml b/src/proto_alpha/lib_client_alpha/client_baking_operations.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_operations.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_operations.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_operations.mli b/src/proto_alpha/lib_client_alpha/client_baking_operations.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_operations.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_operations.mli
diff --git a/src/lib_embedded_client_alpha/client_baking_revelation.ml b/src/proto_alpha/lib_client_alpha/client_baking_revelation.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_revelation.ml
rename to src/proto_alpha/lib_client_alpha/client_baking_revelation.ml
diff --git a/src/lib_embedded_client_alpha/client_baking_revelation.mli b/src/proto_alpha/lib_client_alpha/client_baking_revelation.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_baking_revelation.mli
rename to src/proto_alpha/lib_client_alpha/client_baking_revelation.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_args.ml b/src/proto_alpha/lib_client_alpha/client_proto_args.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_args.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_args.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_args.mli b/src/proto_alpha/lib_client_alpha/client_proto_args.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_args.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_args.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_context.ml b/src/proto_alpha/lib_client_alpha/client_proto_context.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_context.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_context.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_context.mli b/src/proto_alpha/lib_client_alpha/client_proto_context.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_context.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_context.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_context_commands.ml b/src/proto_alpha/lib_client_alpha/client_proto_context_commands.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_context_commands.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_context_commands.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_contracts.ml b/src/proto_alpha/lib_client_alpha/client_proto_contracts.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_contracts.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_contracts.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_contracts.mli b/src/proto_alpha/lib_client_alpha/client_proto_contracts.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_contracts.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_contracts.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_contracts_commands.ml b/src/proto_alpha/lib_client_alpha/client_proto_contracts_commands.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_contracts_commands.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_contracts_commands.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_main.ml b/src/proto_alpha/lib_client_alpha/client_proto_main.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_main.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_main.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_main.mli b/src/proto_alpha/lib_client_alpha/client_proto_main.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_main.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_main.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_nonces.ml b/src/proto_alpha/lib_client_alpha/client_proto_nonces.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_nonces.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_nonces.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_nonces.mli b/src/proto_alpha/lib_client_alpha/client_proto_nonces.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_nonces.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_nonces.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_programs.ml b/src/proto_alpha/lib_client_alpha/client_proto_programs.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_programs.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_programs.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_programs.mli b/src/proto_alpha/lib_client_alpha/client_proto_programs.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_programs.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_programs.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_programs_commands.ml b/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_programs_commands.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_programs_commands.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_programs_commands.mli b/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_programs_commands.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_programs_commands.mli
diff --git a/src/lib_embedded_client_alpha/client_proto_rpcs.ml b/src/proto_alpha/lib_client_alpha/client_proto_rpcs.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_rpcs.ml
rename to src/proto_alpha/lib_client_alpha/client_proto_rpcs.ml
diff --git a/src/lib_embedded_client_alpha/client_proto_rpcs.mli b/src/proto_alpha/lib_client_alpha/client_proto_rpcs.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/client_proto_rpcs.mli
rename to src/proto_alpha/lib_client_alpha/client_proto_rpcs.mli
diff --git a/src/lib_embedded_client_alpha/jbuild b/src/proto_alpha/lib_client_alpha/jbuild
similarity index 100%
rename from src/lib_embedded_client_alpha/jbuild
rename to src/proto_alpha/lib_client_alpha/jbuild
diff --git a/src/lib_embedded_client_alpha/michelson_macros.ml b/src/proto_alpha/lib_client_alpha/michelson_macros.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_macros.ml
rename to src/proto_alpha/lib_client_alpha/michelson_macros.ml
diff --git a/src/lib_embedded_client_alpha/michelson_macros.mli b/src/proto_alpha/lib_client_alpha/michelson_macros.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_macros.mli
rename to src/proto_alpha/lib_client_alpha/michelson_macros.mli
diff --git a/src/lib_embedded_client_alpha/michelson_v1_emacs.ml b/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_emacs.ml
rename to src/proto_alpha/lib_client_alpha/michelson_v1_emacs.ml
diff --git a/src/lib_embedded_client_alpha/michelson_v1_emacs.mli b/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_emacs.mli
rename to src/proto_alpha/lib_client_alpha/michelson_v1_emacs.mli
diff --git a/src/lib_embedded_client_alpha/michelson_v1_error_reporter.ml b/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_error_reporter.ml
rename to src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.ml
diff --git a/src/lib_embedded_client_alpha/michelson_v1_error_reporter.mli b/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_error_reporter.mli
rename to src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.mli
diff --git a/src/lib_embedded_client_alpha/michelson_v1_parser.ml b/src/proto_alpha/lib_client_alpha/michelson_v1_parser.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_parser.ml
rename to src/proto_alpha/lib_client_alpha/michelson_v1_parser.ml
diff --git a/src/lib_embedded_client_alpha/michelson_v1_parser.mli b/src/proto_alpha/lib_client_alpha/michelson_v1_parser.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_parser.mli
rename to src/proto_alpha/lib_client_alpha/michelson_v1_parser.mli
diff --git a/src/lib_embedded_client_alpha/michelson_v1_printer.ml b/src/proto_alpha/lib_client_alpha/michelson_v1_printer.ml
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_printer.ml
rename to src/proto_alpha/lib_client_alpha/michelson_v1_printer.ml
diff --git a/src/lib_embedded_client_alpha/michelson_v1_printer.mli b/src/proto_alpha/lib_client_alpha/michelson_v1_printer.mli
similarity index 100%
rename from src/lib_embedded_client_alpha/michelson_v1_printer.mli
rename to src/proto_alpha/lib_client_alpha/michelson_v1_printer.mli
diff --git a/src/lib_embedded_client_alpha/tezos-embedded-client-alpha.opam b/src/proto_alpha/lib_client_alpha/tezos-embedded-client-alpha.opam
similarity index 100%
rename from src/lib_embedded_client_alpha/tezos-embedded-client-alpha.opam
rename to src/proto_alpha/lib_client_alpha/tezos-embedded-client-alpha.opam
diff --git a/src/proto_alpha/lib_protocol_alpha/jbuild b/src/proto_alpha/lib_protocol_alpha/jbuild
new file mode 120000
index 000000000..3dc6e1fbd
--- /dev/null
+++ b/src/proto_alpha/lib_protocol_alpha/jbuild
@@ -0,0 +1 @@
+../../lib_protocol_compiler/jbuild_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_alpha/src/TEZOS_PROTOCOL b/src/proto_alpha/lib_protocol_alpha/src/TEZOS_PROTOCOL
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/TEZOS_PROTOCOL
rename to src/proto_alpha/lib_protocol_alpha/src/TEZOS_PROTOCOL
diff --git a/src/lib_embedded_protocol_alpha/src/amendment.ml b/src/proto_alpha/lib_protocol_alpha/src/amendment.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/amendment.ml
rename to src/proto_alpha/lib_protocol_alpha/src/amendment.ml
diff --git a/src/lib_embedded_protocol_alpha/src/amendment.mli b/src/proto_alpha/lib_protocol_alpha/src/amendment.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/amendment.mli
rename to src/proto_alpha/lib_protocol_alpha/src/amendment.mli
diff --git a/src/lib_embedded_protocol_alpha/src/apply.ml b/src/proto_alpha/lib_protocol_alpha/src/apply.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/apply.ml
rename to src/proto_alpha/lib_protocol_alpha/src/apply.ml
diff --git a/src/lib_embedded_protocol_alpha/src/baking.ml b/src/proto_alpha/lib_protocol_alpha/src/baking.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/baking.ml
rename to src/proto_alpha/lib_protocol_alpha/src/baking.ml
diff --git a/src/lib_embedded_protocol_alpha/src/baking.mli b/src/proto_alpha/lib_protocol_alpha/src/baking.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/baking.mli
rename to src/proto_alpha/lib_protocol_alpha/src/baking.mli
diff --git a/src/lib_embedded_protocol_alpha/src/block_header_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/block_header_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/block_header_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/block_header_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/block_header_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/block_header_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/bootstrap_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/bootstrap_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/bootstrap_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/bootstrap_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/constants_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/constants_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/contract_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/contract_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/contract_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/contract_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/contract_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/contract_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/contract_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/contract_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/contract_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/contract_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/contract_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/contract_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/contract_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/contract_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/contract_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/contract_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/cycle_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/cycle_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/cycle_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/cycle_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/cycle_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/cycle_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/fitness_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/fitness_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/fitness_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/fitness_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/fitness_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/fitness_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/fitness_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/fitness_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/gas.ml b/src/proto_alpha/lib_protocol_alpha/src/gas.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/gas.ml
rename to src/proto_alpha/lib_protocol_alpha/src/gas.ml
diff --git a/src/lib_embedded_protocol_alpha/src/gas.mli b/src/proto_alpha/lib_protocol_alpha/src/gas.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/gas.mli
rename to src/proto_alpha/lib_protocol_alpha/src/gas.mli
diff --git a/src/lib_embedded_protocol_alpha/src/init_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/init_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/init_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/init_storage.ml
diff --git a/src/proto_alpha/lib_protocol_alpha/src/jbuild b/src/proto_alpha/lib_protocol_alpha/src/jbuild
new file mode 120000
index 000000000..acda1b059
--- /dev/null
+++ b/src/proto_alpha/lib_protocol_alpha/src/jbuild
@@ -0,0 +1 @@
+../../../lib_protocol_compiler/jbuild_embedded_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_alpha/src/level_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/level_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/level_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/level_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/level_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/level_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/level_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/level_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/level_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/level_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/level_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/level_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/level_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/level_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/level_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/level_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/main.ml b/src/proto_alpha/lib_protocol_alpha/src/main.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/main.ml
rename to src/proto_alpha/lib_protocol_alpha/src/main.ml
diff --git a/src/lib_embedded_protocol_alpha/src/main.mli b/src/proto_alpha/lib_protocol_alpha/src/main.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/main.mli
rename to src/proto_alpha/lib_protocol_alpha/src/main.mli
diff --git a/src/lib_embedded_protocol_alpha/src/manager_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/manager_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/manager_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/manager_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/manager_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/manager_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/manager_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/manager_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/michelson_v1_primitives.ml b/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/michelson_v1_primitives.ml
rename to src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.ml
diff --git a/src/lib_embedded_protocol_alpha/src/michelson_v1_primitives.mli b/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/michelson_v1_primitives.mli
rename to src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.mli
diff --git a/src/lib_embedded_protocol_alpha/src/misc.ml b/src/proto_alpha/lib_protocol_alpha/src/misc.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/misc.ml
rename to src/proto_alpha/lib_protocol_alpha/src/misc.ml
diff --git a/src/lib_embedded_protocol_alpha/src/misc.mli b/src/proto_alpha/lib_protocol_alpha/src/misc.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/misc.mli
rename to src/proto_alpha/lib_protocol_alpha/src/misc.mli
diff --git a/src/lib_embedded_protocol_alpha/src/nonce_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/nonce_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/nonce_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/nonce_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/nonce_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/nonce_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/operation_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/operation_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/operation_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/operation_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/operation_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/operation_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/operation_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/operation_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/period_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/period_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/period_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/period_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/period_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/period_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/period_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/period_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/public_key_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/public_key_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/public_key_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/public_key_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/public_key_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/public_key_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/public_key_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/public_key_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/qty_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/qty_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/qty_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/qty_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/raw_context.ml b/src/proto_alpha/lib_protocol_alpha/src/raw_context.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/raw_context.ml
rename to src/proto_alpha/lib_protocol_alpha/src/raw_context.ml
diff --git a/src/lib_embedded_protocol_alpha/src/raw_context.mli b/src/proto_alpha/lib_protocol_alpha/src/raw_context.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/raw_context.mli
rename to src/proto_alpha/lib_protocol_alpha/src/raw_context.mli
diff --git a/src/lib_embedded_protocol_alpha/src/raw_level_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/raw_level_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/raw_level_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/raw_level_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/reward_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/reward_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/reward_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/reward_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/reward_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/reward_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/reward_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/reward_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/roll_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/roll_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/roll_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/roll_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/roll_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/roll_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/roll_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/roll_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/roll_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/roll_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/roll_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/roll_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/roll_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/roll_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/roll_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/roll_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/script_int_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/script_int_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_int_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/script_int_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/script_int_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/script_int_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_int_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/script_int_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/script_interpreter.ml b/src/proto_alpha/lib_protocol_alpha/src/script_interpreter.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_interpreter.ml
rename to src/proto_alpha/lib_protocol_alpha/src/script_interpreter.ml
diff --git a/src/lib_embedded_protocol_alpha/src/script_interpreter.mli b/src/proto_alpha/lib_protocol_alpha/src/script_interpreter.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_interpreter.mli
rename to src/proto_alpha/lib_protocol_alpha/src/script_interpreter.mli
diff --git a/src/lib_embedded_protocol_alpha/src/script_ir_translator.ml b/src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_ir_translator.ml
rename to src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.ml
diff --git a/src/lib_embedded_protocol_alpha/src/script_ir_translator.mli b/src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_ir_translator.mli
rename to src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.mli
diff --git a/src/lib_embedded_protocol_alpha/src/script_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/script_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/script_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/script_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/script_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/script_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/script_timestamp_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_timestamp_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/script_timestamp_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_timestamp_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/script_typed_ir.ml b/src/proto_alpha/lib_protocol_alpha/src/script_typed_ir.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/script_typed_ir.ml
rename to src/proto_alpha/lib_protocol_alpha/src/script_typed_ir.ml
diff --git a/src/lib_embedded_protocol_alpha/src/seed_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/seed_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/seed_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/seed_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/seed_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/seed_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/seed_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/seed_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/seed_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/seed_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/seed_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/seed_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/seed_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/seed_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/seed_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/seed_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/services.ml b/src/proto_alpha/lib_protocol_alpha/src/services.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/services.ml
rename to src/proto_alpha/lib_protocol_alpha/src/services.ml
diff --git a/src/lib_embedded_protocol_alpha/src/services_registration.ml b/src/proto_alpha/lib_protocol_alpha/src/services_registration.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/services_registration.ml
rename to src/proto_alpha/lib_protocol_alpha/src/services_registration.ml
diff --git a/src/lib_embedded_protocol_alpha/src/storage.ml b/src/proto_alpha/lib_protocol_alpha/src/storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/storage.mli b/src/proto_alpha/lib_protocol_alpha/src/storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/storage_functors.ml b/src/proto_alpha/lib_protocol_alpha/src/storage_functors.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/storage_functors.ml
rename to src/proto_alpha/lib_protocol_alpha/src/storage_functors.ml
diff --git a/src/lib_embedded_protocol_alpha/src/storage_functors.mli b/src/proto_alpha/lib_protocol_alpha/src/storage_functors.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/storage_functors.mli
rename to src/proto_alpha/lib_protocol_alpha/src/storage_functors.mli
diff --git a/src/lib_embedded_protocol_alpha/src/storage_sigs.ml b/src/proto_alpha/lib_protocol_alpha/src/storage_sigs.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/storage_sigs.ml
rename to src/proto_alpha/lib_protocol_alpha/src/storage_sigs.ml
diff --git a/src/lib_embedded_protocol_alpha/src/tez_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/tez_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/tez_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/tez_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/tez_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/tez_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/tez_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/tez_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/tezos_context.ml b/src/proto_alpha/lib_protocol_alpha/src/tezos_context.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/tezos_context.ml
rename to src/proto_alpha/lib_protocol_alpha/src/tezos_context.ml
diff --git a/src/lib_embedded_protocol_alpha/src/tezos_context.mli b/src/proto_alpha/lib_protocol_alpha/src/tezos_context.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/tezos_context.mli
rename to src/proto_alpha/lib_protocol_alpha/src/tezos_context.mli
diff --git a/src/lib_embedded_protocol_alpha/src/tezos_hash.ml b/src/proto_alpha/lib_protocol_alpha/src/tezos_hash.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/tezos_hash.ml
rename to src/proto_alpha/lib_protocol_alpha/src/tezos_hash.ml
diff --git a/src/lib_embedded_protocol_alpha/src/time_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/time_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/time_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/time_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/time_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/time_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/time_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/time_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/vote_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/vote_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/vote_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/vote_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/vote_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/vote_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/vote_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/vote_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/src/vote_storage.ml b/src/proto_alpha/lib_protocol_alpha/src/vote_storage.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/vote_storage.ml
rename to src/proto_alpha/lib_protocol_alpha/src/vote_storage.ml
diff --git a/src/lib_embedded_protocol_alpha/src/vote_storage.mli b/src/proto_alpha/lib_protocol_alpha/src/vote_storage.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/vote_storage.mli
rename to src/proto_alpha/lib_protocol_alpha/src/vote_storage.mli
diff --git a/src/lib_embedded_protocol_alpha/src/voting_period_repr.ml b/src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.ml
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/voting_period_repr.ml
rename to src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.ml
diff --git a/src/lib_embedded_protocol_alpha/src/voting_period_repr.mli b/src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.mli
similarity index 100%
rename from src/lib_embedded_protocol_alpha/src/voting_period_repr.mli
rename to src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.mli
diff --git a/src/lib_embedded_protocol_alpha/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam
similarity index 100%
rename from src/lib_embedded_protocol_alpha/tezos-embedded-protocol-alpha.opam
rename to src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam
diff --git a/src/lib_embedded_protocol_alpha/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol_alpha/tezos-protocol-alpha.opam
similarity index 100%
rename from src/lib_embedded_protocol_alpha/tezos-protocol-alpha.opam
rename to src/proto_alpha/lib_protocol_alpha/tezos-protocol-alpha.opam
diff --git a/src/lib_embedded_client_demo/client_proto_main.ml b/src/proto_demo/lib_client_demo/client_proto_main.ml
similarity index 100%
rename from src/lib_embedded_client_demo/client_proto_main.ml
rename to src/proto_demo/lib_client_demo/client_proto_main.ml
diff --git a/src/lib_embedded_client_demo/client_proto_main.mli b/src/proto_demo/lib_client_demo/client_proto_main.mli
similarity index 100%
rename from src/lib_embedded_client_demo/client_proto_main.mli
rename to src/proto_demo/lib_client_demo/client_proto_main.mli
diff --git a/src/lib_embedded_client_demo/client_proto_rpcs.ml b/src/proto_demo/lib_client_demo/client_proto_rpcs.ml
similarity index 100%
rename from src/lib_embedded_client_demo/client_proto_rpcs.ml
rename to src/proto_demo/lib_client_demo/client_proto_rpcs.ml
diff --git a/src/lib_embedded_client_demo/client_proto_rpcs.mli b/src/proto_demo/lib_client_demo/client_proto_rpcs.mli
similarity index 100%
rename from src/lib_embedded_client_demo/client_proto_rpcs.mli
rename to src/proto_demo/lib_client_demo/client_proto_rpcs.mli
diff --git a/src/proto_demo/lib_protocol_demo/jbuild b/src/proto_demo/lib_protocol_demo/jbuild
new file mode 120000
index 000000000..3dc6e1fbd
--- /dev/null
+++ b/src/proto_demo/lib_protocol_demo/jbuild
@@ -0,0 +1 @@
+../../lib_protocol_compiler/jbuild_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_demo/src/TEZOS_PROTOCOL b/src/proto_demo/lib_protocol_demo/src/TEZOS_PROTOCOL
similarity index 100%
rename from src/lib_embedded_protocol_demo/src/TEZOS_PROTOCOL
rename to src/proto_demo/lib_protocol_demo/src/TEZOS_PROTOCOL
diff --git a/src/lib_embedded_protocol_demo/src/error.ml b/src/proto_demo/lib_protocol_demo/src/error.ml
similarity index 100%
rename from src/lib_embedded_protocol_demo/src/error.ml
rename to src/proto_demo/lib_protocol_demo/src/error.ml
diff --git a/src/proto_demo/lib_protocol_demo/src/jbuild b/src/proto_demo/lib_protocol_demo/src/jbuild
new file mode 120000
index 000000000..acda1b059
--- /dev/null
+++ b/src/proto_demo/lib_protocol_demo/src/jbuild
@@ -0,0 +1 @@
+../../../lib_protocol_compiler/jbuild_embedded_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_demo/src/main.ml b/src/proto_demo/lib_protocol_demo/src/main.ml
similarity index 100%
rename from src/lib_embedded_protocol_demo/src/main.ml
rename to src/proto_demo/lib_protocol_demo/src/main.ml
diff --git a/src/lib_embedded_protocol_demo/src/services.ml b/src/proto_demo/lib_protocol_demo/src/services.ml
similarity index 100%
rename from src/lib_embedded_protocol_demo/src/services.ml
rename to src/proto_demo/lib_protocol_demo/src/services.ml
diff --git a/src/lib_embedded_protocol_demo/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam
similarity index 100%
rename from src/lib_embedded_protocol_demo/tezos-embedded-protocol-demo.opam
rename to src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam
diff --git a/src/lib_embedded_protocol_demo/tezos-protocol-demo.opam b/src/proto_demo/lib_protocol_demo/tezos-protocol-demo.opam
similarity index 100%
rename from src/lib_embedded_protocol_demo/tezos-protocol-demo.opam
rename to src/proto_demo/lib_protocol_demo/tezos-protocol-demo.opam
diff --git a/src/lib_embedded_client_genesis/client_proto_main.ml b/src/proto_genesis/lib_client_genesis/client_proto_main.ml
similarity index 100%
rename from src/lib_embedded_client_genesis/client_proto_main.ml
rename to src/proto_genesis/lib_client_genesis/client_proto_main.ml
diff --git a/src/lib_embedded_client_genesis/client_proto_main.mli b/src/proto_genesis/lib_client_genesis/client_proto_main.mli
similarity index 100%
rename from src/lib_embedded_client_genesis/client_proto_main.mli
rename to src/proto_genesis/lib_client_genesis/client_proto_main.mli
diff --git a/src/lib_embedded_client_genesis/jbuild b/src/proto_genesis/lib_client_genesis/jbuild
similarity index 100%
rename from src/lib_embedded_client_genesis/jbuild
rename to src/proto_genesis/lib_client_genesis/jbuild
diff --git a/src/lib_embedded_client_genesis/tezos-embedded-client-genesis.opam b/src/proto_genesis/lib_client_genesis/tezos-embedded-client-genesis.opam
similarity index 100%
rename from src/lib_embedded_client_genesis/tezos-embedded-client-genesis.opam
rename to src/proto_genesis/lib_client_genesis/tezos-embedded-client-genesis.opam
diff --git a/src/proto_genesis/lib_protocol_genesis/jbuild b/src/proto_genesis/lib_protocol_genesis/jbuild
new file mode 120000
index 000000000..3dc6e1fbd
--- /dev/null
+++ b/src/proto_genesis/lib_protocol_genesis/jbuild
@@ -0,0 +1 @@
+../../lib_protocol_compiler/jbuild_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_genesis/src/TEZOS_PROTOCOL b/src/proto_genesis/lib_protocol_genesis/src/TEZOS_PROTOCOL
similarity index 100%
rename from src/lib_embedded_protocol_genesis/src/TEZOS_PROTOCOL
rename to src/proto_genesis/lib_protocol_genesis/src/TEZOS_PROTOCOL
diff --git a/src/lib_embedded_protocol_genesis/src/data.ml b/src/proto_genesis/lib_protocol_genesis/src/data.ml
similarity index 100%
rename from src/lib_embedded_protocol_genesis/src/data.ml
rename to src/proto_genesis/lib_protocol_genesis/src/data.ml
diff --git a/src/proto_genesis/lib_protocol_genesis/src/jbuild b/src/proto_genesis/lib_protocol_genesis/src/jbuild
new file mode 120000
index 000000000..acda1b059
--- /dev/null
+++ b/src/proto_genesis/lib_protocol_genesis/src/jbuild
@@ -0,0 +1 @@
+../../../lib_protocol_compiler/jbuild_embedded_protocol_template
\ No newline at end of file
diff --git a/src/lib_embedded_protocol_genesis/src/main.ml b/src/proto_genesis/lib_protocol_genesis/src/main.ml
similarity index 100%
rename from src/lib_embedded_protocol_genesis/src/main.ml
rename to src/proto_genesis/lib_protocol_genesis/src/main.ml
diff --git a/src/lib_embedded_protocol_genesis/src/services.ml b/src/proto_genesis/lib_protocol_genesis/src/services.ml
similarity index 100%
rename from src/lib_embedded_protocol_genesis/src/services.ml
rename to src/proto_genesis/lib_protocol_genesis/src/services.ml
diff --git a/src/lib_embedded_protocol_genesis/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam
similarity index 100%
rename from src/lib_embedded_protocol_genesis/tezos-embedded-protocol-genesis.opam
rename to src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam
diff --git a/src/lib_embedded_protocol_genesis/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol_genesis/tezos-protocol-genesis.opam
similarity index 100%
rename from src/lib_embedded_protocol_genesis/tezos-protocol-genesis.opam
rename to src/proto_genesis/lib_protocol_genesis/tezos-protocol-genesis.opam