From fda8b4ee5f479e9b05d987f3280210bef4974f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 29 Jan 2018 01:08:26 +0100 Subject: [PATCH] Refactor: rename `prota_alpha/lib_proto` --- src/proto_alpha/{lib_client_alpha => lib_client}/alpha.ml | 0 src/proto_alpha/{lib_client_alpha => lib_client}/alpha.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_blocks.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_blocks.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_daemon.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_daemon.mli | 0 .../client_baking_denunciation.ml | 0 .../client_baking_denunciation.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_endorsement.ml | 0 .../client_baking_endorsement.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_forge.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_forge.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_lib.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_lib.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_main.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_main.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_operations.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_operations.mli | 0 .../{lib_client_alpha => lib_client}/client_baking_revelation.ml | 0 .../{lib_client_alpha => lib_client}/client_baking_revelation.mli | 0 .../{lib_client_alpha => lib_client}/client_proto_args.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_args.mli | 0 .../{lib_client_alpha => lib_client}/client_proto_context.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_context.mli | 0 .../client_proto_context_commands.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_contracts.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_contracts.mli | 0 .../client_proto_contracts_commands.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_main.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_main.mli | 0 .../{lib_client_alpha => lib_client}/client_proto_nonces.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_nonces.mli | 0 .../{lib_client_alpha => lib_client}/client_proto_programs.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_programs.mli | 0 .../client_proto_programs_commands.ml | 0 .../client_proto_programs_commands.mli | 0 .../{lib_client_alpha => lib_client}/client_proto_rpcs.ml | 0 .../{lib_client_alpha => lib_client}/client_proto_rpcs.mli | 0 src/proto_alpha/{lib_client_alpha => lib_client}/jbuild | 0 .../{lib_client_alpha => lib_client}/michelson_macros.ml | 0 .../{lib_client_alpha => lib_client}/michelson_macros.mli | 0 .../{lib_client_alpha => lib_client}/michelson_v1_emacs.ml | 0 .../{lib_client_alpha => lib_client}/michelson_v1_emacs.mli | 0 .../michelson_v1_error_reporter.ml | 0 .../michelson_v1_error_reporter.mli | 0 .../{lib_client_alpha => lib_client}/michelson_v1_parser.ml | 0 .../{lib_client_alpha => lib_client}/michelson_v1_parser.mli | 0 .../{lib_client_alpha => lib_client}/michelson_v1_printer.ml | 0 .../{lib_client_alpha => lib_client}/michelson_v1_printer.mli | 0 src/proto_alpha/{lib_client_alpha => lib_client}/proto_alpha.ml | 0 .../tezos-embedded-client-alpha.opam | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/jbuild | 0 .../{lib_protocol_alpha => lib_protocol}/src/TEZOS_PROTOCOL | 0 .../{lib_protocol_alpha => lib_protocol}/src/amendment.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/amendment.mli | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/apply.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/baking.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/baking.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/block_header_repr.ml | 0 .../src/block_header_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/bootstrap_storage.ml | 0 .../src/bootstrap_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/constants_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/contract_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/contract_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/contract_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/contract_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/cycle_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/cycle_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/fitness_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/fitness_storage.ml | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/gas.ml | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/gas.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/init_storage.ml | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/jbuild | 0 .../{lib_protocol_alpha => lib_protocol}/src/level_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/level_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/level_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/level_storage.mli | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/main.ml | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/main.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/manager_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/manager_repr.mli | 0 .../src/michelson_v1_primitives.ml | 0 .../src/michelson_v1_primitives.mli | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/misc.ml | 0 src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/misc.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/nonce_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/nonce_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/operation_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/operation_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/period_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/period_repr.mli | 0 .../src/public_key_storage.ml | 0 .../src/public_key_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/qty_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/raw_context.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/raw_context.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/raw_level_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/raw_level_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/reward_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/reward_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/roll_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/roll_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/roll_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/roll_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/script_int_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/script_int_repr.mli | 0 .../src/script_interpreter.ml | 0 .../src/script_interpreter.mli | 0 .../src/script_ir_translator.ml | 0 .../src/script_ir_translator.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/script_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/script_repr.mli | 0 .../src/script_timestamp_repr.ml | 0 .../src/script_timestamp_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/script_typed_ir.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/seed_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/seed_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/seed_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/seed_storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/services.ml | 0 .../src/services_registration.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/storage.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/storage_functors.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/storage_functors.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/storage_sigs.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/tez_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/tez_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/tezos_context.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/tezos_context.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/tezos_hash.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/time_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/time_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/vote_repr.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/vote_repr.mli | 0 .../{lib_protocol_alpha => lib_protocol}/src/vote_storage.ml | 0 .../{lib_protocol_alpha => lib_protocol}/src/vote_storage.mli | 0 .../src/voting_period_repr.ml | 0 .../src/voting_period_repr.mli | 0 .../tezos-embedded-protocol-alpha.opam | 0 .../tezos-protocol-alpha.opam | 0 .../{lib_client_demo => lib_client}/client_proto_main.ml | 0 .../{lib_client_demo => lib_client}/client_proto_main.mli | 0 .../{lib_client_demo => lib_client}/client_proto_rpcs.ml | 0 .../{lib_client_demo => lib_client}/client_proto_rpcs.mli | 0 src/proto_demo/{lib_client_demo => lib_client}/proto_demo.ml | 0 src/proto_demo/{lib_protocol_demo => lib_protocol}/jbuild | 0 .../{lib_protocol_demo => lib_protocol}/src/TEZOS_PROTOCOL | 0 src/proto_demo/{lib_protocol_demo => lib_protocol}/src/error.ml | 0 src/proto_demo/{lib_protocol_demo => lib_protocol}/src/jbuild | 0 src/proto_demo/{lib_protocol_demo => lib_protocol}/src/main.ml | 0 .../{lib_protocol_demo => lib_protocol}/src/services.ml | 0 .../tezos-embedded-protocol-demo.opam | 0 .../{lib_protocol_demo => lib_protocol}/tezos-protocol-demo.opam | 0 .../{lib_client_genesis => lib_client}/client_proto_main.ml | 0 .../{lib_client_genesis => lib_client}/client_proto_main.mli | 0 src/proto_genesis/{lib_client_genesis => lib_client}/jbuild | 0 .../{lib_client_genesis => lib_client}/proto_genesis.ml | 0 .../tezos-embedded-client-genesis.opam | 0 src/proto_genesis/{lib_protocol_genesis => lib_protocol}/jbuild | 0 .../{lib_protocol_genesis => lib_protocol}/src/TEZOS_PROTOCOL | 0 .../{lib_protocol_genesis => lib_protocol}/src/data.ml | 0 .../{lib_protocol_genesis => lib_protocol}/src/jbuild | 0 .../{lib_protocol_genesis => lib_protocol}/src/main.ml | 0 .../{lib_protocol_genesis => lib_protocol}/src/services.ml | 0 .../tezos-embedded-protocol-genesis.opam | 0 .../tezos-protocol-genesis.opam | 0 169 files changed, 0 insertions(+), 0 deletions(-) rename src/proto_alpha/{lib_client_alpha => lib_client}/alpha.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/alpha.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_blocks.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_blocks.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_daemon.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_daemon.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_denunciation.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_denunciation.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_endorsement.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_endorsement.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_forge.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_forge.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_lib.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_lib.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_main.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_main.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_operations.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_operations.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_revelation.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_baking_revelation.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_args.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_args.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_context.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_context.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_context_commands.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_contracts.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_contracts.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_contracts_commands.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_main.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_main.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_nonces.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_nonces.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_programs.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_programs.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_programs_commands.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_programs_commands.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_rpcs.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/client_proto_rpcs.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/jbuild (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_macros.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_macros.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_emacs.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_emacs.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_error_reporter.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_error_reporter.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_parser.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_parser.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_printer.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/michelson_v1_printer.mli (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/proto_alpha.ml (100%) rename src/proto_alpha/{lib_client_alpha => lib_client}/tezos-embedded-client-alpha.opam (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/jbuild (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/TEZOS_PROTOCOL (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/amendment.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/amendment.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/apply.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/baking.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/baking.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/block_header_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/block_header_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/bootstrap_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/bootstrap_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/constants_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/contract_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/contract_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/contract_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/contract_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/cycle_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/cycle_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/fitness_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/fitness_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/gas.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/gas.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/init_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/jbuild (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/level_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/level_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/level_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/level_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/main.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/main.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/manager_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/manager_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/michelson_v1_primitives.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/michelson_v1_primitives.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/misc.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/misc.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/nonce_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/nonce_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/operation_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/operation_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/period_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/period_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/public_key_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/public_key_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/qty_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/raw_context.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/raw_context.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/raw_level_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/raw_level_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/reward_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/reward_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/roll_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/roll_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/roll_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/roll_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_int_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_int_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_interpreter.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_interpreter.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_ir_translator.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_ir_translator.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_timestamp_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_timestamp_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/script_typed_ir.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/seed_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/seed_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/seed_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/seed_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/services.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/services_registration.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/storage_functors.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/storage_functors.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/storage_sigs.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/tez_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/tez_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/tezos_context.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/tezos_context.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/tezos_hash.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/time_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/time_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/vote_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/vote_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/vote_storage.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/vote_storage.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/voting_period_repr.ml (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/src/voting_period_repr.mli (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/tezos-embedded-protocol-alpha.opam (100%) rename src/proto_alpha/{lib_protocol_alpha => lib_protocol}/tezos-protocol-alpha.opam (100%) rename src/proto_demo/{lib_client_demo => lib_client}/client_proto_main.ml (100%) rename src/proto_demo/{lib_client_demo => lib_client}/client_proto_main.mli (100%) rename src/proto_demo/{lib_client_demo => lib_client}/client_proto_rpcs.ml (100%) rename src/proto_demo/{lib_client_demo => lib_client}/client_proto_rpcs.mli (100%) rename src/proto_demo/{lib_client_demo => lib_client}/proto_demo.ml (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/jbuild (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/src/TEZOS_PROTOCOL (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/src/error.ml (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/src/jbuild (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/src/main.ml (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/src/services.ml (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/tezos-embedded-protocol-demo.opam (100%) rename src/proto_demo/{lib_protocol_demo => lib_protocol}/tezos-protocol-demo.opam (100%) rename src/proto_genesis/{lib_client_genesis => lib_client}/client_proto_main.ml (100%) rename src/proto_genesis/{lib_client_genesis => lib_client}/client_proto_main.mli (100%) rename src/proto_genesis/{lib_client_genesis => lib_client}/jbuild (100%) rename src/proto_genesis/{lib_client_genesis => lib_client}/proto_genesis.ml (100%) rename src/proto_genesis/{lib_client_genesis => lib_client}/tezos-embedded-client-genesis.opam (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/jbuild (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/src/TEZOS_PROTOCOL (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/src/data.ml (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/src/jbuild (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/src/main.ml (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/src/services.ml (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/tezos-embedded-protocol-genesis.opam (100%) rename src/proto_genesis/{lib_protocol_genesis => lib_protocol}/tezos-protocol-genesis.opam (100%) diff --git a/src/proto_alpha/lib_client_alpha/alpha.ml b/src/proto_alpha/lib_client/alpha.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/alpha.ml rename to src/proto_alpha/lib_client/alpha.ml diff --git a/src/proto_alpha/lib_client_alpha/alpha.mli b/src/proto_alpha/lib_client/alpha.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/alpha.mli rename to src/proto_alpha/lib_client/alpha.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_blocks.ml b/src/proto_alpha/lib_client/client_baking_blocks.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_blocks.ml rename to src/proto_alpha/lib_client/client_baking_blocks.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_blocks.mli b/src/proto_alpha/lib_client/client_baking_blocks.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_blocks.mli rename to src/proto_alpha/lib_client/client_baking_blocks.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_daemon.ml b/src/proto_alpha/lib_client/client_baking_daemon.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_daemon.ml rename to src/proto_alpha/lib_client/client_baking_daemon.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_daemon.mli b/src/proto_alpha/lib_client/client_baking_daemon.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_daemon.mli rename to src/proto_alpha/lib_client/client_baking_daemon.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_denunciation.ml b/src/proto_alpha/lib_client/client_baking_denunciation.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_denunciation.ml rename to src/proto_alpha/lib_client/client_baking_denunciation.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_denunciation.mli b/src/proto_alpha/lib_client/client_baking_denunciation.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_denunciation.mli rename to src/proto_alpha/lib_client/client_baking_denunciation.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_endorsement.ml b/src/proto_alpha/lib_client/client_baking_endorsement.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_endorsement.ml rename to src/proto_alpha/lib_client/client_baking_endorsement.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_endorsement.mli b/src/proto_alpha/lib_client/client_baking_endorsement.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_endorsement.mli rename to src/proto_alpha/lib_client/client_baking_endorsement.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_forge.ml b/src/proto_alpha/lib_client/client_baking_forge.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_forge.ml rename to src/proto_alpha/lib_client/client_baking_forge.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_forge.mli b/src/proto_alpha/lib_client/client_baking_forge.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_forge.mli rename to src/proto_alpha/lib_client/client_baking_forge.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_lib.ml b/src/proto_alpha/lib_client/client_baking_lib.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_lib.ml rename to src/proto_alpha/lib_client/client_baking_lib.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_lib.mli b/src/proto_alpha/lib_client/client_baking_lib.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_lib.mli rename to src/proto_alpha/lib_client/client_baking_lib.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_main.ml b/src/proto_alpha/lib_client/client_baking_main.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_main.ml rename to src/proto_alpha/lib_client/client_baking_main.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_main.mli b/src/proto_alpha/lib_client/client_baking_main.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_main.mli rename to src/proto_alpha/lib_client/client_baking_main.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_operations.ml b/src/proto_alpha/lib_client/client_baking_operations.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_operations.ml rename to src/proto_alpha/lib_client/client_baking_operations.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_operations.mli b/src/proto_alpha/lib_client/client_baking_operations.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_operations.mli rename to src/proto_alpha/lib_client/client_baking_operations.mli diff --git a/src/proto_alpha/lib_client_alpha/client_baking_revelation.ml b/src/proto_alpha/lib_client/client_baking_revelation.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_revelation.ml rename to src/proto_alpha/lib_client/client_baking_revelation.ml diff --git a/src/proto_alpha/lib_client_alpha/client_baking_revelation.mli b/src/proto_alpha/lib_client/client_baking_revelation.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_baking_revelation.mli rename to src/proto_alpha/lib_client/client_baking_revelation.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_args.ml b/src/proto_alpha/lib_client/client_proto_args.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_args.ml rename to src/proto_alpha/lib_client/client_proto_args.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_args.mli b/src/proto_alpha/lib_client/client_proto_args.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_args.mli rename to src/proto_alpha/lib_client/client_proto_args.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_context.ml b/src/proto_alpha/lib_client/client_proto_context.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_context.ml rename to src/proto_alpha/lib_client/client_proto_context.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_context.mli b/src/proto_alpha/lib_client/client_proto_context.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_context.mli rename to src/proto_alpha/lib_client/client_proto_context.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_context_commands.ml b/src/proto_alpha/lib_client/client_proto_context_commands.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_context_commands.ml rename to src/proto_alpha/lib_client/client_proto_context_commands.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_contracts.ml b/src/proto_alpha/lib_client/client_proto_contracts.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_contracts.ml rename to src/proto_alpha/lib_client/client_proto_contracts.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_contracts.mli b/src/proto_alpha/lib_client/client_proto_contracts.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_contracts.mli rename to src/proto_alpha/lib_client/client_proto_contracts.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_contracts_commands.ml b/src/proto_alpha/lib_client/client_proto_contracts_commands.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_contracts_commands.ml rename to src/proto_alpha/lib_client/client_proto_contracts_commands.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_main.ml b/src/proto_alpha/lib_client/client_proto_main.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_main.ml rename to src/proto_alpha/lib_client/client_proto_main.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_main.mli b/src/proto_alpha/lib_client/client_proto_main.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_main.mli rename to src/proto_alpha/lib_client/client_proto_main.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_nonces.ml b/src/proto_alpha/lib_client/client_proto_nonces.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_nonces.ml rename to src/proto_alpha/lib_client/client_proto_nonces.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_nonces.mli b/src/proto_alpha/lib_client/client_proto_nonces.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_nonces.mli rename to src/proto_alpha/lib_client/client_proto_nonces.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_programs.ml b/src/proto_alpha/lib_client/client_proto_programs.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_programs.ml rename to src/proto_alpha/lib_client/client_proto_programs.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_programs.mli b/src/proto_alpha/lib_client/client_proto_programs.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_programs.mli rename to src/proto_alpha/lib_client/client_proto_programs.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.ml b/src/proto_alpha/lib_client/client_proto_programs_commands.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_programs_commands.ml rename to src/proto_alpha/lib_client/client_proto_programs_commands.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_programs_commands.mli b/src/proto_alpha/lib_client/client_proto_programs_commands.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_programs_commands.mli rename to src/proto_alpha/lib_client/client_proto_programs_commands.mli diff --git a/src/proto_alpha/lib_client_alpha/client_proto_rpcs.ml b/src/proto_alpha/lib_client/client_proto_rpcs.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_rpcs.ml rename to src/proto_alpha/lib_client/client_proto_rpcs.ml diff --git a/src/proto_alpha/lib_client_alpha/client_proto_rpcs.mli b/src/proto_alpha/lib_client/client_proto_rpcs.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/client_proto_rpcs.mli rename to src/proto_alpha/lib_client/client_proto_rpcs.mli diff --git a/src/proto_alpha/lib_client_alpha/jbuild b/src/proto_alpha/lib_client/jbuild similarity index 100% rename from src/proto_alpha/lib_client_alpha/jbuild rename to src/proto_alpha/lib_client/jbuild diff --git a/src/proto_alpha/lib_client_alpha/michelson_macros.ml b/src/proto_alpha/lib_client/michelson_macros.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_macros.ml rename to src/proto_alpha/lib_client/michelson_macros.ml diff --git a/src/proto_alpha/lib_client_alpha/michelson_macros.mli b/src/proto_alpha/lib_client/michelson_macros.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_macros.mli rename to src/proto_alpha/lib_client/michelson_macros.mli diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.ml b/src/proto_alpha/lib_client/michelson_v1_emacs.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_emacs.ml rename to src/proto_alpha/lib_client/michelson_v1_emacs.ml diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_emacs.mli b/src/proto_alpha/lib_client/michelson_v1_emacs.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_emacs.mli rename to src/proto_alpha/lib_client/michelson_v1_emacs.mli diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.ml b/src/proto_alpha/lib_client/michelson_v1_error_reporter.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.ml rename to src/proto_alpha/lib_client/michelson_v1_error_reporter.ml diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.mli b/src/proto_alpha/lib_client/michelson_v1_error_reporter.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_error_reporter.mli rename to src/proto_alpha/lib_client/michelson_v1_error_reporter.mli diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_parser.ml b/src/proto_alpha/lib_client/michelson_v1_parser.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_parser.ml rename to src/proto_alpha/lib_client/michelson_v1_parser.ml diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_parser.mli b/src/proto_alpha/lib_client/michelson_v1_parser.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_parser.mli rename to src/proto_alpha/lib_client/michelson_v1_parser.mli diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_printer.ml b/src/proto_alpha/lib_client/michelson_v1_printer.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_printer.ml rename to src/proto_alpha/lib_client/michelson_v1_printer.ml diff --git a/src/proto_alpha/lib_client_alpha/michelson_v1_printer.mli b/src/proto_alpha/lib_client/michelson_v1_printer.mli similarity index 100% rename from src/proto_alpha/lib_client_alpha/michelson_v1_printer.mli rename to src/proto_alpha/lib_client/michelson_v1_printer.mli diff --git a/src/proto_alpha/lib_client_alpha/proto_alpha.ml b/src/proto_alpha/lib_client/proto_alpha.ml similarity index 100% rename from src/proto_alpha/lib_client_alpha/proto_alpha.ml rename to src/proto_alpha/lib_client/proto_alpha.ml diff --git a/src/proto_alpha/lib_client_alpha/tezos-embedded-client-alpha.opam b/src/proto_alpha/lib_client/tezos-embedded-client-alpha.opam similarity index 100% rename from src/proto_alpha/lib_client_alpha/tezos-embedded-client-alpha.opam rename to src/proto_alpha/lib_client/tezos-embedded-client-alpha.opam diff --git a/src/proto_alpha/lib_protocol_alpha/jbuild b/src/proto_alpha/lib_protocol/jbuild similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/jbuild rename to src/proto_alpha/lib_protocol/jbuild diff --git a/src/proto_alpha/lib_protocol_alpha/src/TEZOS_PROTOCOL b/src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/TEZOS_PROTOCOL rename to src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL diff --git a/src/proto_alpha/lib_protocol_alpha/src/amendment.ml b/src/proto_alpha/lib_protocol/src/amendment.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/amendment.ml rename to src/proto_alpha/lib_protocol/src/amendment.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/amendment.mli b/src/proto_alpha/lib_protocol/src/amendment.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/amendment.mli rename to src/proto_alpha/lib_protocol/src/amendment.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/apply.ml b/src/proto_alpha/lib_protocol/src/apply.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/apply.ml rename to src/proto_alpha/lib_protocol/src/apply.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/baking.ml b/src/proto_alpha/lib_protocol/src/baking.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/baking.ml rename to src/proto_alpha/lib_protocol/src/baking.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/baking.mli b/src/proto_alpha/lib_protocol/src/baking.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/baking.mli rename to src/proto_alpha/lib_protocol/src/baking.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.ml b/src/proto_alpha/lib_protocol/src/block_header_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/block_header_repr.ml rename to src/proto_alpha/lib_protocol/src/block_header_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/block_header_repr.mli b/src/proto_alpha/lib_protocol/src/block_header_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/block_header_repr.mli rename to src/proto_alpha/lib_protocol/src/block_header_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.ml b/src/proto_alpha/lib_protocol/src/bootstrap_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.ml rename to src/proto_alpha/lib_protocol/src/bootstrap_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.mli b/src/proto_alpha/lib_protocol/src/bootstrap_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/bootstrap_storage.mli rename to src/proto_alpha/lib_protocol/src/bootstrap_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml b/src/proto_alpha/lib_protocol/src/constants_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/constants_repr.ml rename to src/proto_alpha/lib_protocol/src/constants_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/contract_repr.ml b/src/proto_alpha/lib_protocol/src/contract_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/contract_repr.ml rename to src/proto_alpha/lib_protocol/src/contract_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/contract_repr.mli b/src/proto_alpha/lib_protocol/src/contract_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/contract_repr.mli rename to src/proto_alpha/lib_protocol/src/contract_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/contract_storage.ml b/src/proto_alpha/lib_protocol/src/contract_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/contract_storage.ml rename to src/proto_alpha/lib_protocol/src/contract_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/contract_storage.mli b/src/proto_alpha/lib_protocol/src/contract_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/contract_storage.mli rename to src/proto_alpha/lib_protocol/src/contract_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.ml b/src/proto_alpha/lib_protocol/src/cycle_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/cycle_repr.ml rename to src/proto_alpha/lib_protocol/src/cycle_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/cycle_repr.mli b/src/proto_alpha/lib_protocol/src/cycle_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/cycle_repr.mli rename to src/proto_alpha/lib_protocol/src/cycle_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/fitness_repr.ml b/src/proto_alpha/lib_protocol/src/fitness_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/fitness_repr.ml rename to src/proto_alpha/lib_protocol/src/fitness_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/fitness_storage.ml b/src/proto_alpha/lib_protocol/src/fitness_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/fitness_storage.ml rename to src/proto_alpha/lib_protocol/src/fitness_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/gas.ml b/src/proto_alpha/lib_protocol/src/gas.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/gas.ml rename to src/proto_alpha/lib_protocol/src/gas.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/gas.mli b/src/proto_alpha/lib_protocol/src/gas.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/gas.mli rename to src/proto_alpha/lib_protocol/src/gas.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/init_storage.ml b/src/proto_alpha/lib_protocol/src/init_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/init_storage.ml rename to src/proto_alpha/lib_protocol/src/init_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/jbuild b/src/proto_alpha/lib_protocol/src/jbuild similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/jbuild rename to src/proto_alpha/lib_protocol/src/jbuild diff --git a/src/proto_alpha/lib_protocol_alpha/src/level_repr.ml b/src/proto_alpha/lib_protocol/src/level_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/level_repr.ml rename to src/proto_alpha/lib_protocol/src/level_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/level_repr.mli b/src/proto_alpha/lib_protocol/src/level_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/level_repr.mli rename to src/proto_alpha/lib_protocol/src/level_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/level_storage.ml b/src/proto_alpha/lib_protocol/src/level_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/level_storage.ml rename to src/proto_alpha/lib_protocol/src/level_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/level_storage.mli b/src/proto_alpha/lib_protocol/src/level_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/level_storage.mli rename to src/proto_alpha/lib_protocol/src/level_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/main.ml b/src/proto_alpha/lib_protocol/src/main.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/main.ml rename to src/proto_alpha/lib_protocol/src/main.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/main.mli b/src/proto_alpha/lib_protocol/src/main.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/main.mli rename to src/proto_alpha/lib_protocol/src/main.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/manager_repr.ml b/src/proto_alpha/lib_protocol/src/manager_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/manager_repr.ml rename to src/proto_alpha/lib_protocol/src/manager_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/manager_repr.mli b/src/proto_alpha/lib_protocol/src/manager_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/manager_repr.mli rename to src/proto_alpha/lib_protocol/src/manager_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.ml b/src/proto_alpha/lib_protocol/src/michelson_v1_primitives.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.ml rename to src/proto_alpha/lib_protocol/src/michelson_v1_primitives.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.mli b/src/proto_alpha/lib_protocol/src/michelson_v1_primitives.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/michelson_v1_primitives.mli rename to src/proto_alpha/lib_protocol/src/michelson_v1_primitives.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/misc.ml b/src/proto_alpha/lib_protocol/src/misc.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/misc.ml rename to src/proto_alpha/lib_protocol/src/misc.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/misc.mli b/src/proto_alpha/lib_protocol/src/misc.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/misc.mli rename to src/proto_alpha/lib_protocol/src/misc.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.ml b/src/proto_alpha/lib_protocol/src/nonce_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/nonce_storage.ml rename to src/proto_alpha/lib_protocol/src/nonce_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/nonce_storage.mli b/src/proto_alpha/lib_protocol/src/nonce_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/nonce_storage.mli rename to src/proto_alpha/lib_protocol/src/nonce_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/operation_repr.ml b/src/proto_alpha/lib_protocol/src/operation_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/operation_repr.ml rename to src/proto_alpha/lib_protocol/src/operation_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/operation_repr.mli b/src/proto_alpha/lib_protocol/src/operation_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/operation_repr.mli rename to src/proto_alpha/lib_protocol/src/operation_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/period_repr.ml b/src/proto_alpha/lib_protocol/src/period_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/period_repr.ml rename to src/proto_alpha/lib_protocol/src/period_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/period_repr.mli b/src/proto_alpha/lib_protocol/src/period_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/period_repr.mli rename to src/proto_alpha/lib_protocol/src/period_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/public_key_storage.ml b/src/proto_alpha/lib_protocol/src/public_key_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/public_key_storage.ml rename to src/proto_alpha/lib_protocol/src/public_key_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/public_key_storage.mli b/src/proto_alpha/lib_protocol/src/public_key_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/public_key_storage.mli rename to src/proto_alpha/lib_protocol/src/public_key_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/qty_repr.ml b/src/proto_alpha/lib_protocol/src/qty_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/qty_repr.ml rename to src/proto_alpha/lib_protocol/src/qty_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/raw_context.ml b/src/proto_alpha/lib_protocol/src/raw_context.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/raw_context.ml rename to src/proto_alpha/lib_protocol/src/raw_context.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/raw_context.mli b/src/proto_alpha/lib_protocol/src/raw_context.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/raw_context.mli rename to src/proto_alpha/lib_protocol/src/raw_context.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.ml b/src/proto_alpha/lib_protocol/src/raw_level_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.ml rename to src/proto_alpha/lib_protocol/src/raw_level_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.mli b/src/proto_alpha/lib_protocol/src/raw_level_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/raw_level_repr.mli rename to src/proto_alpha/lib_protocol/src/raw_level_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/reward_storage.ml b/src/proto_alpha/lib_protocol/src/reward_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/reward_storage.ml rename to src/proto_alpha/lib_protocol/src/reward_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/reward_storage.mli b/src/proto_alpha/lib_protocol/src/reward_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/reward_storage.mli rename to src/proto_alpha/lib_protocol/src/reward_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/roll_repr.ml b/src/proto_alpha/lib_protocol/src/roll_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/roll_repr.ml rename to src/proto_alpha/lib_protocol/src/roll_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/roll_repr.mli b/src/proto_alpha/lib_protocol/src/roll_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/roll_repr.mli rename to src/proto_alpha/lib_protocol/src/roll_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/roll_storage.ml b/src/proto_alpha/lib_protocol/src/roll_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/roll_storage.ml rename to src/proto_alpha/lib_protocol/src/roll_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/roll_storage.mli b/src/proto_alpha/lib_protocol/src/roll_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/roll_storage.mli rename to src/proto_alpha/lib_protocol/src/roll_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_int_repr.ml b/src/proto_alpha/lib_protocol/src/script_int_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_int_repr.ml rename to src/proto_alpha/lib_protocol/src/script_int_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_int_repr.mli b/src/proto_alpha/lib_protocol/src/script_int_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_int_repr.mli rename to src/proto_alpha/lib_protocol/src/script_int_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_interpreter.ml b/src/proto_alpha/lib_protocol/src/script_interpreter.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_interpreter.ml rename to src/proto_alpha/lib_protocol/src/script_interpreter.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_interpreter.mli b/src/proto_alpha/lib_protocol/src/script_interpreter.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_interpreter.mli rename to src/proto_alpha/lib_protocol/src/script_interpreter.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.ml b/src/proto_alpha/lib_protocol/src/script_ir_translator.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.ml rename to src/proto_alpha/lib_protocol/src/script_ir_translator.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.mli b/src/proto_alpha/lib_protocol/src/script_ir_translator.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_ir_translator.mli rename to src/proto_alpha/lib_protocol/src/script_ir_translator.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_repr.ml b/src/proto_alpha/lib_protocol/src/script_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_repr.ml rename to src/proto_alpha/lib_protocol/src/script_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_repr.mli b/src/proto_alpha/lib_protocol/src/script_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_repr.mli rename to src/proto_alpha/lib_protocol/src/script_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.ml b/src/proto_alpha/lib_protocol/src/script_timestamp_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.ml rename to src/proto_alpha/lib_protocol/src/script_timestamp_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.mli b/src/proto_alpha/lib_protocol/src/script_timestamp_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_timestamp_repr.mli rename to src/proto_alpha/lib_protocol/src/script_timestamp_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/script_typed_ir.ml b/src/proto_alpha/lib_protocol/src/script_typed_ir.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/script_typed_ir.ml rename to src/proto_alpha/lib_protocol/src/script_typed_ir.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/seed_repr.ml b/src/proto_alpha/lib_protocol/src/seed_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/seed_repr.ml rename to src/proto_alpha/lib_protocol/src/seed_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/seed_repr.mli b/src/proto_alpha/lib_protocol/src/seed_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/seed_repr.mli rename to src/proto_alpha/lib_protocol/src/seed_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/seed_storage.ml b/src/proto_alpha/lib_protocol/src/seed_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/seed_storage.ml rename to src/proto_alpha/lib_protocol/src/seed_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/seed_storage.mli b/src/proto_alpha/lib_protocol/src/seed_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/seed_storage.mli rename to src/proto_alpha/lib_protocol/src/seed_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/services.ml b/src/proto_alpha/lib_protocol/src/services.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/services.ml rename to src/proto_alpha/lib_protocol/src/services.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/services_registration.ml b/src/proto_alpha/lib_protocol/src/services_registration.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/services_registration.ml rename to src/proto_alpha/lib_protocol/src/services_registration.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/storage.ml b/src/proto_alpha/lib_protocol/src/storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/storage.ml rename to src/proto_alpha/lib_protocol/src/storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/storage.mli b/src/proto_alpha/lib_protocol/src/storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/storage.mli rename to src/proto_alpha/lib_protocol/src/storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/storage_functors.ml b/src/proto_alpha/lib_protocol/src/storage_functors.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/storage_functors.ml rename to src/proto_alpha/lib_protocol/src/storage_functors.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/storage_functors.mli b/src/proto_alpha/lib_protocol/src/storage_functors.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/storage_functors.mli rename to src/proto_alpha/lib_protocol/src/storage_functors.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/storage_sigs.ml b/src/proto_alpha/lib_protocol/src/storage_sigs.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/storage_sigs.ml rename to src/proto_alpha/lib_protocol/src/storage_sigs.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/tez_repr.ml b/src/proto_alpha/lib_protocol/src/tez_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/tez_repr.ml rename to src/proto_alpha/lib_protocol/src/tez_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/tez_repr.mli b/src/proto_alpha/lib_protocol/src/tez_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/tez_repr.mli rename to src/proto_alpha/lib_protocol/src/tez_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/tezos_context.ml b/src/proto_alpha/lib_protocol/src/tezos_context.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/tezos_context.ml rename to src/proto_alpha/lib_protocol/src/tezos_context.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/tezos_context.mli b/src/proto_alpha/lib_protocol/src/tezos_context.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/tezos_context.mli rename to src/proto_alpha/lib_protocol/src/tezos_context.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/tezos_hash.ml b/src/proto_alpha/lib_protocol/src/tezos_hash.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/tezos_hash.ml rename to src/proto_alpha/lib_protocol/src/tezos_hash.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/time_repr.ml b/src/proto_alpha/lib_protocol/src/time_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/time_repr.ml rename to src/proto_alpha/lib_protocol/src/time_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/time_repr.mli b/src/proto_alpha/lib_protocol/src/time_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/time_repr.mli rename to src/proto_alpha/lib_protocol/src/time_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/vote_repr.ml b/src/proto_alpha/lib_protocol/src/vote_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/vote_repr.ml rename to src/proto_alpha/lib_protocol/src/vote_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/vote_repr.mli b/src/proto_alpha/lib_protocol/src/vote_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/vote_repr.mli rename to src/proto_alpha/lib_protocol/src/vote_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/vote_storage.ml b/src/proto_alpha/lib_protocol/src/vote_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/vote_storage.ml rename to src/proto_alpha/lib_protocol/src/vote_storage.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/vote_storage.mli b/src/proto_alpha/lib_protocol/src/vote_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/vote_storage.mli rename to src/proto_alpha/lib_protocol/src/vote_storage.mli diff --git a/src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.ml b/src/proto_alpha/lib_protocol/src/voting_period_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.ml rename to src/proto_alpha/lib_protocol/src/voting_period_repr.ml diff --git a/src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.mli b/src/proto_alpha/lib_protocol/src/voting_period_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/src/voting_period_repr.mli rename to src/proto_alpha/lib_protocol/src/voting_period_repr.mli diff --git a/src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/tezos-embedded-protocol-alpha.opam rename to src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam diff --git a/src/proto_alpha/lib_protocol_alpha/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam similarity index 100% rename from src/proto_alpha/lib_protocol_alpha/tezos-protocol-alpha.opam rename to src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam diff --git a/src/proto_demo/lib_client_demo/client_proto_main.ml b/src/proto_demo/lib_client/client_proto_main.ml similarity index 100% rename from src/proto_demo/lib_client_demo/client_proto_main.ml rename to src/proto_demo/lib_client/client_proto_main.ml diff --git a/src/proto_demo/lib_client_demo/client_proto_main.mli b/src/proto_demo/lib_client/client_proto_main.mli similarity index 100% rename from src/proto_demo/lib_client_demo/client_proto_main.mli rename to src/proto_demo/lib_client/client_proto_main.mli diff --git a/src/proto_demo/lib_client_demo/client_proto_rpcs.ml b/src/proto_demo/lib_client/client_proto_rpcs.ml similarity index 100% rename from src/proto_demo/lib_client_demo/client_proto_rpcs.ml rename to src/proto_demo/lib_client/client_proto_rpcs.ml diff --git a/src/proto_demo/lib_client_demo/client_proto_rpcs.mli b/src/proto_demo/lib_client/client_proto_rpcs.mli similarity index 100% rename from src/proto_demo/lib_client_demo/client_proto_rpcs.mli rename to src/proto_demo/lib_client/client_proto_rpcs.mli diff --git a/src/proto_demo/lib_client_demo/proto_demo.ml b/src/proto_demo/lib_client/proto_demo.ml similarity index 100% rename from src/proto_demo/lib_client_demo/proto_demo.ml rename to src/proto_demo/lib_client/proto_demo.ml diff --git a/src/proto_demo/lib_protocol_demo/jbuild b/src/proto_demo/lib_protocol/jbuild similarity index 100% rename from src/proto_demo/lib_protocol_demo/jbuild rename to src/proto_demo/lib_protocol/jbuild diff --git a/src/proto_demo/lib_protocol_demo/src/TEZOS_PROTOCOL b/src/proto_demo/lib_protocol/src/TEZOS_PROTOCOL similarity index 100% rename from src/proto_demo/lib_protocol_demo/src/TEZOS_PROTOCOL rename to src/proto_demo/lib_protocol/src/TEZOS_PROTOCOL diff --git a/src/proto_demo/lib_protocol_demo/src/error.ml b/src/proto_demo/lib_protocol/src/error.ml similarity index 100% rename from src/proto_demo/lib_protocol_demo/src/error.ml rename to src/proto_demo/lib_protocol/src/error.ml diff --git a/src/proto_demo/lib_protocol_demo/src/jbuild b/src/proto_demo/lib_protocol/src/jbuild similarity index 100% rename from src/proto_demo/lib_protocol_demo/src/jbuild rename to src/proto_demo/lib_protocol/src/jbuild diff --git a/src/proto_demo/lib_protocol_demo/src/main.ml b/src/proto_demo/lib_protocol/src/main.ml similarity index 100% rename from src/proto_demo/lib_protocol_demo/src/main.ml rename to src/proto_demo/lib_protocol/src/main.ml diff --git a/src/proto_demo/lib_protocol_demo/src/services.ml b/src/proto_demo/lib_protocol/src/services.ml similarity index 100% rename from src/proto_demo/lib_protocol_demo/src/services.ml rename to src/proto_demo/lib_protocol/src/services.ml diff --git a/src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam similarity index 100% rename from src/proto_demo/lib_protocol_demo/tezos-embedded-protocol-demo.opam rename to src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam diff --git a/src/proto_demo/lib_protocol_demo/tezos-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam similarity index 100% rename from src/proto_demo/lib_protocol_demo/tezos-protocol-demo.opam rename to src/proto_demo/lib_protocol/tezos-protocol-demo.opam diff --git a/src/proto_genesis/lib_client_genesis/client_proto_main.ml b/src/proto_genesis/lib_client/client_proto_main.ml similarity index 100% rename from src/proto_genesis/lib_client_genesis/client_proto_main.ml rename to src/proto_genesis/lib_client/client_proto_main.ml diff --git a/src/proto_genesis/lib_client_genesis/client_proto_main.mli b/src/proto_genesis/lib_client/client_proto_main.mli similarity index 100% rename from src/proto_genesis/lib_client_genesis/client_proto_main.mli rename to src/proto_genesis/lib_client/client_proto_main.mli diff --git a/src/proto_genesis/lib_client_genesis/jbuild b/src/proto_genesis/lib_client/jbuild similarity index 100% rename from src/proto_genesis/lib_client_genesis/jbuild rename to src/proto_genesis/lib_client/jbuild diff --git a/src/proto_genesis/lib_client_genesis/proto_genesis.ml b/src/proto_genesis/lib_client/proto_genesis.ml similarity index 100% rename from src/proto_genesis/lib_client_genesis/proto_genesis.ml rename to src/proto_genesis/lib_client/proto_genesis.ml diff --git a/src/proto_genesis/lib_client_genesis/tezos-embedded-client-genesis.opam b/src/proto_genesis/lib_client/tezos-embedded-client-genesis.opam similarity index 100% rename from src/proto_genesis/lib_client_genesis/tezos-embedded-client-genesis.opam rename to src/proto_genesis/lib_client/tezos-embedded-client-genesis.opam diff --git a/src/proto_genesis/lib_protocol_genesis/jbuild b/src/proto_genesis/lib_protocol/jbuild similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/jbuild rename to src/proto_genesis/lib_protocol/jbuild diff --git a/src/proto_genesis/lib_protocol_genesis/src/TEZOS_PROTOCOL b/src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/src/TEZOS_PROTOCOL rename to src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL diff --git a/src/proto_genesis/lib_protocol_genesis/src/data.ml b/src/proto_genesis/lib_protocol/src/data.ml similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/src/data.ml rename to src/proto_genesis/lib_protocol/src/data.ml diff --git a/src/proto_genesis/lib_protocol_genesis/src/jbuild b/src/proto_genesis/lib_protocol/src/jbuild similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/src/jbuild rename to src/proto_genesis/lib_protocol/src/jbuild diff --git a/src/proto_genesis/lib_protocol_genesis/src/main.ml b/src/proto_genesis/lib_protocol/src/main.ml similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/src/main.ml rename to src/proto_genesis/lib_protocol/src/main.ml diff --git a/src/proto_genesis/lib_protocol_genesis/src/services.ml b/src/proto_genesis/lib_protocol/src/services.ml similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/src/services.ml rename to src/proto_genesis/lib_protocol/src/services.ml diff --git a/src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/tezos-embedded-protocol-genesis.opam rename to src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam diff --git a/src/proto_genesis/lib_protocol_genesis/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam similarity index 100% rename from src/proto_genesis/lib_protocol_genesis/tezos-protocol-genesis.opam rename to src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam