fixing bad sed-fu on move

libraries/chain/block.cpp

@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainblock.hpp>
+#include <eosio/chain/block.hpp>
 #include <fc/io/raw.hpp>
 #include <fc/bitutil.hpp>
 #include <algorithm>

libraries/chain/block_log.cpp

@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainblock_log.hpp>
+#include <eosio/chain/block_log.hpp>
 #include <fstream>
 #include <fc/io/raw.hpp>
 

libraries/chain/block_schedule.cpp

@@ -2,8 +2,8 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainblock_schedule.hpp>
-#include <eosio/chainblock.hpp>
+#include <eosio/chain/block_schedule.hpp>
+#include <eosio/chain/block.hpp>
 
 namespace eosio { namespace chain {
 

libraries/chain/chain_config.cpp

@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainchain_config.hpp>
+#include <eosio/chain/chain_config.hpp>
 
 #include <boost/range/algorithm/nth_element.hpp>
 

libraries/chain/chain_controller.cpp

@@ -3,19 +3,19 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosio/chainchain_controller.hpp>
-
-#include <eosio/chainblock_summary_object.hpp>
-#include <eosio/chainglobal_property_object.hpp>
-#include <eosio/chainkey_value_object.hpp>
-#include <eosio/chainaction_objects.hpp>
-#include <eosio/chaingenerated_transaction_object.hpp>
-#include <eosio/chaintransaction_object.hpp>
-#include <eosio/chainproducer_object.hpp>
-#include <eosio/chainpermission_link_object.hpp>
-#include <eosio/chainauthority_checker.hpp>
-
-#include <eosio/chainwasm_interface.hpp>
+#include <eosio/chain/chain_controller.hpp>
+
+#include <eosio/chain/block_summary_object.hpp>
+#include <eosio/chain/global_property_object.hpp>
+#include <eosio/chain/key_value_object.hpp>
+#include <eosio/chain/action_objects.hpp>
+#include <eosio/chain/generated_transaction_object.hpp>
+#include <eosio/chain/transaction_object.hpp>
+#include <eosio/chain/producer_object.hpp>
+#include <eosio/chain/permission_link_object.hpp>
+#include <eosio/chain/authority_checker.hpp>
+
+#include <eosio/chain/wasm_interface.hpp>
 
 #include <eos/utilities/rand.hpp>
 

libraries/chain/contracts/eos_contract.cpp

@@ -2,24 +2,24 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chaincontracts/eos_contract.hpp>
-
-#include <eosio/chainchain_controller.hpp>
-#include <eosio/chainapply_context.hpp>
-#include <eosio/chaintransaction.hpp>
-#include <eosio/chainexceptions.hpp>
-
-#include <eosio/chainaccount_object.hpp>
-#include <eosio/chaincontracts/balance_object.hpp>
-#include <eosio/chainpermission_object.hpp>
-#include <eosio/chainpermission_link_object.hpp>
-#include <eosio/chainglobal_property_object.hpp>
-#include <eosio/chaincontracts/staked_balance_objects.hpp>
-#include <eosio/chaincontracts/producer_objects.hpp>
-#include <eosio/chaincontracts/types.hpp>
-#include <eosio/chainproducer_object.hpp>
-
-#include <eosio/chainwasm_interface.hpp>
+#include <eosio/chain/contracts/eos_contract.hpp>
+
+#include <eosio/chain/chain_controller.hpp>
+#include <eosio/chain/apply_context.hpp>
+#include <eosio/chain/transaction.hpp>
+#include <eosio/chain/exceptions.hpp>
+
+#include <eosio/chain/account_object.hpp>
+#include <eosio/chain/contracts/balance_object.hpp>
+#include <eosio/chain/permission_object.hpp>
+#include <eosio/chain/permission_link_object.hpp>
+#include <eosio/chain/global_property_object.hpp>
+#include <eosio/chain/contracts/staked_balance_objects.hpp>
+#include <eosio/chain/contracts/producer_objects.hpp>
+#include <eosio/chain/contracts/types.hpp>
+#include <eosio/chain/producer_object.hpp>
+
+#include <eosio/chain/wasm_interface.hpp>
 //#include <eos/types/abiSerializer.hpp>
 
 namespace eosio { namespace chain { namespace contracts {

libraries/chain/contracts/genesis_state.cpp

@@ -3,7 +3,7 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosio/chaincontracts/genesis_state.hpp>
+#include <eosio/chain/contracts/genesis_state.hpp>
 
 // these are required to serialize a genesis_state
 #include <fc/smart_ref_impl.hpp>   // required for gcc in release mode

libraries/chain/contracts/native_contract_chain_administrator.cpp

@@ -2,12 +2,12 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chaincontracts/native_contract_chain_administrator.hpp>
-#include <eosio/chaincontracts/producer_objects.hpp>
-#include <eosio/chaincontracts/types.hpp>
+#include <eosio/chain/contracts/native_contract_chain_administrator.hpp>
+#include <eosio/chain/contracts/producer_objects.hpp>
+#include <eosio/chain/contracts/types.hpp>
 
-#include <eosio/chainglobal_property_object.hpp>
-#include <eosio/chainproducer_object.hpp>
+#include <eosio/chain/global_property_object.hpp>
+#include <eosio/chain/producer_object.hpp>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/transformed.hpp>

libraries/chain/contracts/native_contract_chain_initializer.cpp

@@ -2,13 +2,13 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chaincontracts/native_contract_chain_initializer.hpp>
-#include <eosio/chaincontracts/objects.hpp>
-#include <eosio/chaincontracts/eos_contract.hpp>
-#include <eosio/chaincontracts/types.hpp>
+#include <eosio/chain/contracts/native_contract_chain_initializer.hpp>
+#include <eosio/chain/contracts/objects.hpp>
+#include <eosio/chain/contracts/eos_contract.hpp>
+#include <eosio/chain/contracts/types.hpp>
 
-#include <eosio/chainproducer_object.hpp>
-#include <eosio/chainpermission_object.hpp>
+#include <eosio/chain/producer_object.hpp>
+#include <eosio/chain/permission_object.hpp>
 
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/algorithm/copy.hpp>

libraries/chain/contracts/producer_objects.cpp

@@ -2,10 +2,10 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chaincontracts/producer_objects.hpp>
-#include <eosio/chaincontracts/staked_balance_objects.hpp>
+#include <eosio/chain/contracts/producer_objects.hpp>
+#include <eosio/chain/contracts/staked_balance_objects.hpp>
 
-#include <eosio/chainproducer_object.hpp>
+#include <eosio/chain/producer_object.hpp>
 
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm.hpp>

libraries/chain/contracts/staked_balance_objects.cpp

@@ -2,10 +2,10 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chaincontracts/staked_balance_objects.hpp>
-#include <eosio/chaincontracts/producer_objects.hpp>
+#include <eosio/chain/contracts/staked_balance_objects.hpp>
+#include <eosio/chain/contracts/producer_objects.hpp>
 
-#include <eosio/chainglobal_property_object.hpp>
+#include <eosio/chain/global_property_object.hpp>
 
 #include <boost/range/algorithm/for_each.hpp>
 

libraries/chain/fork_database.cpp

@@ -2,8 +2,8 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainfork_database.hpp>
-#include <eosio/chainexceptions.hpp>
+#include <eosio/chain/fork_database.hpp>
+#include <eosio/chain/exceptions.hpp>
 #include <fc/smart_ref_impl.hpp>
 
 namespace eosio { namespace chain {

libraries/chain/get_config.cpp

@@ -3,9 +3,9 @@
  *  @copyright defined in eos/LICENSE.txt
  */
 
-#include <eosio/chainget_config.hpp>
-#include <eosio/chainconfig.hpp>
-#include <eosio/chaintypes.hpp>
+#include <eosio/chain/get_config.hpp>
+#include <eosio/chain/config.hpp>
+#include <eosio/chain/types.hpp>
 
 namespace eosio { namespace chain {
 

libraries/chain/message_handling_contexts.cpp

@@ -2,11 +2,11 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainmessage_handling_contexts.hpp>
-#include <eosio/chainpermission_object.hpp>
-#include <eosio/chainexceptions.hpp>
-#include <eosio/chainkey_value_object.hpp>
-#include <eosio/chainchain_controller.hpp>
+#include <eosio/chain/message_handling_contexts.hpp>
+#include <eosio/chain/permission_object.hpp>
+#include <eosio/chain/exceptions.hpp>
+#include <eosio/chain/key_value_object.hpp>
+#include <eosio/chain/chain_controller.hpp>
 
 #include <eos/utilities/parallel_markers.hpp>
 

libraries/chain/name.cpp

-#include <eosio/chainname.hpp>
+#include <eosio/chain/name.hpp>
 #include <fc/variant.hpp>
 #include <boost/algorithm/string.hpp>
 #include <fc/exception/exception.hpp>

libraries/chain/transaction.cpp

@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainexceptions.hpp>
+#include <eosio/chain/exceptions.hpp>
 #include <fc/io/raw.hpp>
 #include <fc/bitutil.hpp>
 #include <fc/smart_ref_impl.hpp>

libraries/chain/wasm_interface.cpp

-#include <eosio/chainwasm_interface.hpp>
-#include <eosio/chainapply_context.hpp>
+#include <eosio/chain/wasm_interface.hpp>
+#include <eosio/chain/apply_context.hpp>
 #include <boost/core/ignore_unused.hpp>
 
 #include <Runtime/Runtime.h>

libraries/chain/wast_to_wasm.cpp

@@ -2,7 +2,7 @@
  *  @file
  *  @copyright defined in eos/LICENSE.txt
  */
-#include <eosio/chainwast_to_wasm.hpp>
+#include <eosio/chain/wast_to_wasm.hpp>
 #include <Inline/BasicTypes.h>
 #include <IR/Module.h>
 #include <IR/Validate.h>