diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a2c534364eb420631117a796b3abd1c8c87b9ed..cb33e39d2f1044d79ce1d67eeddf47641cf26f36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ ENABLE_TESTING()
 
 IF ( BUILD_HIVE_TESTNET )
     add_subdirectory(unit)
-    add_subdirectory(hived/hive_functional)
+    add_subdirectory(functional)
 ELSE ( BUILD_HIVE_TESTNET )
-    add_subdirectory(hived/api_tests)
+    add_subdirectory(api_tests)
 ENDIF ( BUILD_HIVE_TESTNET )
\ No newline at end of file
diff --git a/hived/api_tests/.gitignore b/api_tests/.gitignore
similarity index 100%
rename from hived/api_tests/.gitignore
rename to api_tests/.gitignore
diff --git a/hived/api_tests/CMakeLists.txt b/api_tests/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/CMakeLists.txt
rename to api_tests/CMakeLists.txt
diff --git a/hived/api_tests/README.md b/api_tests/README.md
similarity index 100%
rename from hived/api_tests/README.md
rename to api_tests/README.md
diff --git a/hived/api_tests/account_by_key_api/CMakeLists.txt b/api_tests/account_by_key_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/account_by_key_api/CMakeLists.txt
rename to api_tests/account_by_key_api/CMakeLists.txt
diff --git a/hived/api_tests/account_by_key_api/get_key_references.py b/api_tests/account_by_key_api/get_key_references.py
similarity index 100%
rename from hived/api_tests/account_by_key_api/get_key_references.py
rename to api_tests/account_by_key_api/get_key_references.py
diff --git a/hived/api_tests/account_by_key_api/readme.md b/api_tests/account_by_key_api/readme.md
similarity index 100%
rename from hived/api_tests/account_by_key_api/readme.md
rename to api_tests/account_by_key_api/readme.md
diff --git a/hived/api_tests/account_history_api/CMakeLists.txt b/api_tests/account_history_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/account_history_api/CMakeLists.txt
rename to api_tests/account_history_api/CMakeLists.txt
diff --git a/hived/api_tests/account_history_api/enum_virtual_ops.py b/api_tests/account_history_api/enum_virtual_ops.py
similarity index 100%
rename from hived/api_tests/account_history_api/enum_virtual_ops.py
rename to api_tests/account_history_api/enum_virtual_ops.py
diff --git a/hived/api_tests/account_history_api/get_account_history.py b/api_tests/account_history_api/get_account_history.py
similarity index 100%
rename from hived/api_tests/account_history_api/get_account_history.py
rename to api_tests/account_history_api/get_account_history.py
diff --git a/hived/api_tests/account_history_api/get_ops_in_block.py b/api_tests/account_history_api/get_ops_in_block.py
similarity index 100%
rename from hived/api_tests/account_history_api/get_ops_in_block.py
rename to api_tests/account_history_api/get_ops_in_block.py
diff --git a/hived/api_tests/account_history_api/get_transaction.py b/api_tests/account_history_api/get_transaction.py
similarity index 100%
rename from hived/api_tests/account_history_api/get_transaction.py
rename to api_tests/account_history_api/get_transaction.py
diff --git a/hived/api_tests/account_history_api/readme.md b/api_tests/account_history_api/readme.md
similarity index 100%
rename from hived/api_tests/account_history_api/readme.md
rename to api_tests/account_history_api/readme.md
diff --git a/hived/api_tests/condenser_api/CMakeLists.txt b/api_tests/condenser_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/condenser_api/CMakeLists.txt
rename to api_tests/condenser_api/CMakeLists.txt
diff --git a/hived/api_tests/condenser_api/README.md b/api_tests/condenser_api/README.md
similarity index 100%
rename from hived/api_tests/condenser_api/README.md
rename to api_tests/condenser_api/README.md
diff --git a/hived/api_tests/condenser_api/broadcast_block.py b/api_tests/condenser_api/broadcast_block.py
similarity index 100%
rename from hived/api_tests/condenser_api/broadcast_block.py
rename to api_tests/condenser_api/broadcast_block.py
diff --git a/hived/api_tests/condenser_api/broadcast_transaction.py b/api_tests/condenser_api/broadcast_transaction.py
similarity index 100%
rename from hived/api_tests/condenser_api/broadcast_transaction.py
rename to api_tests/condenser_api/broadcast_transaction.py
diff --git a/hived/api_tests/condenser_api/broadcast_transaction_synchronous.py b/api_tests/condenser_api/broadcast_transaction_synchronous.py
similarity index 100%
rename from hived/api_tests/condenser_api/broadcast_transaction_synchronous.py
rename to api_tests/condenser_api/broadcast_transaction_synchronous.py
diff --git a/hived/api_tests/condenser_api/find_proposals.py b/api_tests/condenser_api/find_proposals.py
similarity index 100%
rename from hived/api_tests/condenser_api/find_proposals.py
rename to api_tests/condenser_api/find_proposals.py
diff --git a/hived/api_tests/condenser_api/get_account_count.py b/api_tests/condenser_api/get_account_count.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_account_count.py
rename to api_tests/condenser_api/get_account_count.py
diff --git a/hived/api_tests/condenser_api/get_account_history.py b/api_tests/condenser_api/get_account_history.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_account_history.py
rename to api_tests/condenser_api/get_account_history.py
diff --git a/hived/api_tests/condenser_api/get_accounts.py b/api_tests/condenser_api/get_accounts.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_accounts.py
rename to api_tests/condenser_api/get_accounts.py
diff --git a/hived/api_tests/condenser_api/get_active_witnesses.py b/api_tests/condenser_api/get_active_witnesses.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_active_witnesses.py
rename to api_tests/condenser_api/get_active_witnesses.py
diff --git a/hived/api_tests/condenser_api/get_block.py b/api_tests/condenser_api/get_block.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_block.py
rename to api_tests/condenser_api/get_block.py
diff --git a/hived/api_tests/condenser_api/get_block_header.py b/api_tests/condenser_api/get_block_header.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_block_header.py
rename to api_tests/condenser_api/get_block_header.py
diff --git a/hived/api_tests/condenser_api/get_chain_properties.py b/api_tests/condenser_api/get_chain_properties.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_chain_properties.py
rename to api_tests/condenser_api/get_chain_properties.py
diff --git a/hived/api_tests/condenser_api/get_config.py b/api_tests/condenser_api/get_config.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_config.py
rename to api_tests/condenser_api/get_config.py
diff --git a/hived/api_tests/condenser_api/get_conversion_requests.py b/api_tests/condenser_api/get_conversion_requests.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_conversion_requests.py
rename to api_tests/condenser_api/get_conversion_requests.py
diff --git a/hived/api_tests/condenser_api/get_current_median_history_price.py b/api_tests/condenser_api/get_current_median_history_price.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_current_median_history_price.py
rename to api_tests/condenser_api/get_current_median_history_price.py
diff --git a/hived/api_tests/condenser_api/get_dynamic_global_properties.py b/api_tests/condenser_api/get_dynamic_global_properties.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_dynamic_global_properties.py
rename to api_tests/condenser_api/get_dynamic_global_properties.py
diff --git a/hived/api_tests/condenser_api/get_escrow.py b/api_tests/condenser_api/get_escrow.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_escrow.py
rename to api_tests/condenser_api/get_escrow.py
diff --git a/hived/api_tests/condenser_api/get_expiring_vesting_delegations.py b/api_tests/condenser_api/get_expiring_vesting_delegations.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_expiring_vesting_delegations.py
rename to api_tests/condenser_api/get_expiring_vesting_delegations.py
diff --git a/hived/api_tests/condenser_api/get_feed_history.py b/api_tests/condenser_api/get_feed_history.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_feed_history.py
rename to api_tests/condenser_api/get_feed_history.py
diff --git a/hived/api_tests/condenser_api/get_hardfork_version.py b/api_tests/condenser_api/get_hardfork_version.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_hardfork_version.py
rename to api_tests/condenser_api/get_hardfork_version.py
diff --git a/hived/api_tests/condenser_api/get_key_references.py b/api_tests/condenser_api/get_key_references.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_key_references.py
rename to api_tests/condenser_api/get_key_references.py
diff --git a/hived/api_tests/condenser_api/get_market_history.py b/api_tests/condenser_api/get_market_history.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_market_history.py
rename to api_tests/condenser_api/get_market_history.py
diff --git a/hived/api_tests/condenser_api/get_market_history_buckets.py b/api_tests/condenser_api/get_market_history_buckets.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_market_history_buckets.py
rename to api_tests/condenser_api/get_market_history_buckets.py
diff --git a/hived/api_tests/condenser_api/get_next_scheduled_hardfork.py b/api_tests/condenser_api/get_next_scheduled_hardfork.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_next_scheduled_hardfork.py
rename to api_tests/condenser_api/get_next_scheduled_hardfork.py
diff --git a/hived/api_tests/condenser_api/get_open_orders.py b/api_tests/condenser_api/get_open_orders.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_open_orders.py
rename to api_tests/condenser_api/get_open_orders.py
diff --git a/hived/api_tests/condenser_api/get_ops_in_block.py b/api_tests/condenser_api/get_ops_in_block.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_ops_in_block.py
rename to api_tests/condenser_api/get_ops_in_block.py
diff --git a/hived/api_tests/condenser_api/get_order_book.py b/api_tests/condenser_api/get_order_book.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_order_book.py
rename to api_tests/condenser_api/get_order_book.py
diff --git a/hived/api_tests/condenser_api/get_owner_history.py b/api_tests/condenser_api/get_owner_history.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_owner_history.py
rename to api_tests/condenser_api/get_owner_history.py
diff --git a/hived/api_tests/condenser_api/get_potential_signatures.py b/api_tests/condenser_api/get_potential_signatures.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_potential_signatures.py
rename to api_tests/condenser_api/get_potential_signatures.py
diff --git a/hived/api_tests/condenser_api/get_recent_trades.py b/api_tests/condenser_api/get_recent_trades.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_recent_trades.py
rename to api_tests/condenser_api/get_recent_trades.py
diff --git a/hived/api_tests/condenser_api/get_recovery_request.py b/api_tests/condenser_api/get_recovery_request.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_recovery_request.py
rename to api_tests/condenser_api/get_recovery_request.py
diff --git a/hived/api_tests/condenser_api/get_required_signatures.py b/api_tests/condenser_api/get_required_signatures.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_required_signatures.py
rename to api_tests/condenser_api/get_required_signatures.py
diff --git a/hived/api_tests/condenser_api/get_reward_fund.py b/api_tests/condenser_api/get_reward_fund.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_reward_fund.py
rename to api_tests/condenser_api/get_reward_fund.py
diff --git a/hived/api_tests/condenser_api/get_savings_withdraw_from.py b/api_tests/condenser_api/get_savings_withdraw_from.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_savings_withdraw_from.py
rename to api_tests/condenser_api/get_savings_withdraw_from.py
diff --git a/hived/api_tests/condenser_api/get_savings_withdraw_to.py b/api_tests/condenser_api/get_savings_withdraw_to.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_savings_withdraw_to.py
rename to api_tests/condenser_api/get_savings_withdraw_to.py
diff --git a/hived/api_tests/condenser_api/get_ticker.py b/api_tests/condenser_api/get_ticker.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_ticker.py
rename to api_tests/condenser_api/get_ticker.py
diff --git a/hived/api_tests/condenser_api/get_trade_history.py b/api_tests/condenser_api/get_trade_history.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_trade_history.py
rename to api_tests/condenser_api/get_trade_history.py
diff --git a/hived/api_tests/condenser_api/get_transaction.py b/api_tests/condenser_api/get_transaction.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_transaction.py
rename to api_tests/condenser_api/get_transaction.py
diff --git a/hived/api_tests/condenser_api/get_transaction_hex.py b/api_tests/condenser_api/get_transaction_hex.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_transaction_hex.py
rename to api_tests/condenser_api/get_transaction_hex.py
diff --git a/hived/api_tests/condenser_api/get_version.py b/api_tests/condenser_api/get_version.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_version.py
rename to api_tests/condenser_api/get_version.py
diff --git a/hived/api_tests/condenser_api/get_vesting_delegations.py b/api_tests/condenser_api/get_vesting_delegations.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_vesting_delegations.py
rename to api_tests/condenser_api/get_vesting_delegations.py
diff --git a/hived/api_tests/condenser_api/get_volume.py b/api_tests/condenser_api/get_volume.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_volume.py
rename to api_tests/condenser_api/get_volume.py
diff --git a/hived/api_tests/condenser_api/get_withdraw_routes.py b/api_tests/condenser_api/get_withdraw_routes.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_withdraw_routes.py
rename to api_tests/condenser_api/get_withdraw_routes.py
diff --git a/hived/api_tests/condenser_api/get_witness_by_account.py b/api_tests/condenser_api/get_witness_by_account.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_witness_by_account.py
rename to api_tests/condenser_api/get_witness_by_account.py
diff --git a/hived/api_tests/condenser_api/get_witness_count.py b/api_tests/condenser_api/get_witness_count.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_witness_count.py
rename to api_tests/condenser_api/get_witness_count.py
diff --git a/hived/api_tests/condenser_api/get_witness_schedule.py b/api_tests/condenser_api/get_witness_schedule.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_witness_schedule.py
rename to api_tests/condenser_api/get_witness_schedule.py
diff --git a/hived/api_tests/condenser_api/get_witnesses.py b/api_tests/condenser_api/get_witnesses.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_witnesses.py
rename to api_tests/condenser_api/get_witnesses.py
diff --git a/hived/api_tests/condenser_api/get_witnesses_by_vote.py b/api_tests/condenser_api/get_witnesses_by_vote.py
similarity index 100%
rename from hived/api_tests/condenser_api/get_witnesses_by_vote.py
rename to api_tests/condenser_api/get_witnesses_by_vote.py
diff --git a/hived/api_tests/condenser_api/list_proposal_votes.py b/api_tests/condenser_api/list_proposal_votes.py
similarity index 100%
rename from hived/api_tests/condenser_api/list_proposal_votes.py
rename to api_tests/condenser_api/list_proposal_votes.py
diff --git a/hived/api_tests/condenser_api/list_proposals.py b/api_tests/condenser_api/list_proposals.py
similarity index 100%
rename from hived/api_tests/condenser_api/list_proposals.py
rename to api_tests/condenser_api/list_proposals.py
diff --git a/hived/api_tests/condenser_api/lookup_account_names.py b/api_tests/condenser_api/lookup_account_names.py
similarity index 100%
rename from hived/api_tests/condenser_api/lookup_account_names.py
rename to api_tests/condenser_api/lookup_account_names.py
diff --git a/hived/api_tests/condenser_api/lookup_accounts.py b/api_tests/condenser_api/lookup_accounts.py
similarity index 100%
rename from hived/api_tests/condenser_api/lookup_accounts.py
rename to api_tests/condenser_api/lookup_accounts.py
diff --git a/hived/api_tests/condenser_api/lookup_witness_accounts.py b/api_tests/condenser_api/lookup_witness_accounts.py
similarity index 100%
rename from hived/api_tests/condenser_api/lookup_witness_accounts.py
rename to api_tests/condenser_api/lookup_witness_accounts.py
diff --git a/hived/api_tests/condenser_api/verify_authority.py b/api_tests/condenser_api/verify_authority.py
similarity index 100%
rename from hived/api_tests/condenser_api/verify_authority.py
rename to api_tests/condenser_api/verify_authority.py
diff --git a/hived/api_tests/database_api/CMakeLists.txt b/api_tests/database_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/database_api/CMakeLists.txt
rename to api_tests/database_api/CMakeLists.txt
diff --git a/hived/api_tests/database_api/README.md b/api_tests/database_api/README.md
similarity index 100%
rename from hived/api_tests/database_api/README.md
rename to api_tests/database_api/README.md
diff --git a/hived/api_tests/database_api/find_account_recovery_requests.py b/api_tests/database_api/find_account_recovery_requests.py
similarity index 100%
rename from hived/api_tests/database_api/find_account_recovery_requests.py
rename to api_tests/database_api/find_account_recovery_requests.py
diff --git a/hived/api_tests/database_api/find_accounts.py b/api_tests/database_api/find_accounts.py
similarity index 100%
rename from hived/api_tests/database_api/find_accounts.py
rename to api_tests/database_api/find_accounts.py
diff --git a/hived/api_tests/database_api/find_change_recovery_account_requests.py b/api_tests/database_api/find_change_recovery_account_requests.py
similarity index 100%
rename from hived/api_tests/database_api/find_change_recovery_account_requests.py
rename to api_tests/database_api/find_change_recovery_account_requests.py
diff --git a/hived/api_tests/database_api/find_decline_voting_rights_requests.py b/api_tests/database_api/find_decline_voting_rights_requests.py
similarity index 100%
rename from hived/api_tests/database_api/find_decline_voting_rights_requests.py
rename to api_tests/database_api/find_decline_voting_rights_requests.py
diff --git a/hived/api_tests/database_api/find_escrows.py b/api_tests/database_api/find_escrows.py
similarity index 100%
rename from hived/api_tests/database_api/find_escrows.py
rename to api_tests/database_api/find_escrows.py
diff --git a/hived/api_tests/database_api/find_hbd_conversion_requests.py b/api_tests/database_api/find_hbd_conversion_requests.py
similarity index 100%
rename from hived/api_tests/database_api/find_hbd_conversion_requests.py
rename to api_tests/database_api/find_hbd_conversion_requests.py
diff --git a/hived/api_tests/database_api/find_limit_orders.py b/api_tests/database_api/find_limit_orders.py
similarity index 100%
rename from hived/api_tests/database_api/find_limit_orders.py
rename to api_tests/database_api/find_limit_orders.py
diff --git a/hived/api_tests/database_api/find_owner_histories.py b/api_tests/database_api/find_owner_histories.py
similarity index 100%
rename from hived/api_tests/database_api/find_owner_histories.py
rename to api_tests/database_api/find_owner_histories.py
diff --git a/hived/api_tests/database_api/find_proposals.py b/api_tests/database_api/find_proposals.py
similarity index 100%
rename from hived/api_tests/database_api/find_proposals.py
rename to api_tests/database_api/find_proposals.py
diff --git a/hived/api_tests/database_api/find_savings_withdrawals.py b/api_tests/database_api/find_savings_withdrawals.py
similarity index 100%
rename from hived/api_tests/database_api/find_savings_withdrawals.py
rename to api_tests/database_api/find_savings_withdrawals.py
diff --git a/hived/api_tests/database_api/find_smt_contributions.py b/api_tests/database_api/find_smt_contributions.py
similarity index 100%
rename from hived/api_tests/database_api/find_smt_contributions.py
rename to api_tests/database_api/find_smt_contributions.py
diff --git a/hived/api_tests/database_api/find_smt_token_emissions.py b/api_tests/database_api/find_smt_token_emissions.py
similarity index 100%
rename from hived/api_tests/database_api/find_smt_token_emissions.py
rename to api_tests/database_api/find_smt_token_emissions.py
diff --git a/hived/api_tests/database_api/find_smt_tokens.py b/api_tests/database_api/find_smt_tokens.py
similarity index 100%
rename from hived/api_tests/database_api/find_smt_tokens.py
rename to api_tests/database_api/find_smt_tokens.py
diff --git a/hived/api_tests/database_api/find_vesting_delegation_expirations.py b/api_tests/database_api/find_vesting_delegation_expirations.py
similarity index 100%
rename from hived/api_tests/database_api/find_vesting_delegation_expirations.py
rename to api_tests/database_api/find_vesting_delegation_expirations.py
diff --git a/hived/api_tests/database_api/find_vesting_delegations.py b/api_tests/database_api/find_vesting_delegations.py
similarity index 100%
rename from hived/api_tests/database_api/find_vesting_delegations.py
rename to api_tests/database_api/find_vesting_delegations.py
diff --git a/hived/api_tests/database_api/find_votes.py b/api_tests/database_api/find_votes.py
similarity index 100%
rename from hived/api_tests/database_api/find_votes.py
rename to api_tests/database_api/find_votes.py
diff --git a/hived/api_tests/database_api/find_withdraw_vesting_routes.py b/api_tests/database_api/find_withdraw_vesting_routes.py
similarity index 100%
rename from hived/api_tests/database_api/find_withdraw_vesting_routes.py
rename to api_tests/database_api/find_withdraw_vesting_routes.py
diff --git a/hived/api_tests/database_api/find_witnesses.py b/api_tests/database_api/find_witnesses.py
similarity index 100%
rename from hived/api_tests/database_api/find_witnesses.py
rename to api_tests/database_api/find_witnesses.py
diff --git a/hived/api_tests/database_api/get_active_witnesses.py b/api_tests/database_api/get_active_witnesses.py
similarity index 100%
rename from hived/api_tests/database_api/get_active_witnesses.py
rename to api_tests/database_api/get_active_witnesses.py
diff --git a/hived/api_tests/database_api/get_config.py b/api_tests/database_api/get_config.py
similarity index 100%
rename from hived/api_tests/database_api/get_config.py
rename to api_tests/database_api/get_config.py
diff --git a/hived/api_tests/database_api/get_current_price_feed.py b/api_tests/database_api/get_current_price_feed.py
similarity index 100%
rename from hived/api_tests/database_api/get_current_price_feed.py
rename to api_tests/database_api/get_current_price_feed.py
diff --git a/hived/api_tests/database_api/get_dynamic_global_properties.py b/api_tests/database_api/get_dynamic_global_properties.py
similarity index 100%
rename from hived/api_tests/database_api/get_dynamic_global_properties.py
rename to api_tests/database_api/get_dynamic_global_properties.py
diff --git a/hived/api_tests/database_api/get_feed_history.py b/api_tests/database_api/get_feed_history.py
similarity index 100%
rename from hived/api_tests/database_api/get_feed_history.py
rename to api_tests/database_api/get_feed_history.py
diff --git a/hived/api_tests/database_api/get_hardfork_properties.py b/api_tests/database_api/get_hardfork_properties.py
similarity index 100%
rename from hived/api_tests/database_api/get_hardfork_properties.py
rename to api_tests/database_api/get_hardfork_properties.py
diff --git a/hived/api_tests/database_api/get_nai_pool.py b/api_tests/database_api/get_nai_pool.py
similarity index 100%
rename from hived/api_tests/database_api/get_nai_pool.py
rename to api_tests/database_api/get_nai_pool.py
diff --git a/hived/api_tests/database_api/get_order_book.py b/api_tests/database_api/get_order_book.py
similarity index 100%
rename from hived/api_tests/database_api/get_order_book.py
rename to api_tests/database_api/get_order_book.py
diff --git a/hived/api_tests/database_api/get_potential_signatures.py b/api_tests/database_api/get_potential_signatures.py
similarity index 100%
rename from hived/api_tests/database_api/get_potential_signatures.py
rename to api_tests/database_api/get_potential_signatures.py
diff --git a/hived/api_tests/database_api/get_required_signatures.py b/api_tests/database_api/get_required_signatures.py
similarity index 100%
rename from hived/api_tests/database_api/get_required_signatures.py
rename to api_tests/database_api/get_required_signatures.py
diff --git a/hived/api_tests/database_api/get_reward_funds.py b/api_tests/database_api/get_reward_funds.py
similarity index 100%
rename from hived/api_tests/database_api/get_reward_funds.py
rename to api_tests/database_api/get_reward_funds.py
diff --git a/hived/api_tests/database_api/get_transaction_hex.py b/api_tests/database_api/get_transaction_hex.py
similarity index 100%
rename from hived/api_tests/database_api/get_transaction_hex.py
rename to api_tests/database_api/get_transaction_hex.py
diff --git a/hived/api_tests/database_api/get_version.py b/api_tests/database_api/get_version.py
similarity index 100%
rename from hived/api_tests/database_api/get_version.py
rename to api_tests/database_api/get_version.py
diff --git a/hived/api_tests/database_api/get_witness_schedule.py b/api_tests/database_api/get_witness_schedule.py
similarity index 100%
rename from hived/api_tests/database_api/get_witness_schedule.py
rename to api_tests/database_api/get_witness_schedule.py
diff --git a/hived/api_tests/database_api/list_account_recovery_requests.py b/api_tests/database_api/list_account_recovery_requests.py
similarity index 100%
rename from hived/api_tests/database_api/list_account_recovery_requests.py
rename to api_tests/database_api/list_account_recovery_requests.py
diff --git a/hived/api_tests/database_api/list_accounts.py b/api_tests/database_api/list_accounts.py
similarity index 100%
rename from hived/api_tests/database_api/list_accounts.py
rename to api_tests/database_api/list_accounts.py
diff --git a/hived/api_tests/database_api/list_change_recovery_account_requests.py b/api_tests/database_api/list_change_recovery_account_requests.py
similarity index 100%
rename from hived/api_tests/database_api/list_change_recovery_account_requests.py
rename to api_tests/database_api/list_change_recovery_account_requests.py
diff --git a/hived/api_tests/database_api/list_decline_voting_rights_requests.py b/api_tests/database_api/list_decline_voting_rights_requests.py
similarity index 100%
rename from hived/api_tests/database_api/list_decline_voting_rights_requests.py
rename to api_tests/database_api/list_decline_voting_rights_requests.py
diff --git a/hived/api_tests/database_api/list_escrows.py b/api_tests/database_api/list_escrows.py
similarity index 100%
rename from hived/api_tests/database_api/list_escrows.py
rename to api_tests/database_api/list_escrows.py
diff --git a/hived/api_tests/database_api/list_hbd_conversion_requests.py b/api_tests/database_api/list_hbd_conversion_requests.py
similarity index 100%
rename from hived/api_tests/database_api/list_hbd_conversion_requests.py
rename to api_tests/database_api/list_hbd_conversion_requests.py
diff --git a/hived/api_tests/database_api/list_limit_orders.py b/api_tests/database_api/list_limit_orders.py
similarity index 100%
rename from hived/api_tests/database_api/list_limit_orders.py
rename to api_tests/database_api/list_limit_orders.py
diff --git a/hived/api_tests/database_api/list_owner_histories.py b/api_tests/database_api/list_owner_histories.py
similarity index 100%
rename from hived/api_tests/database_api/list_owner_histories.py
rename to api_tests/database_api/list_owner_histories.py
diff --git a/hived/api_tests/database_api/list_proposal_votes.py b/api_tests/database_api/list_proposal_votes.py
similarity index 100%
rename from hived/api_tests/database_api/list_proposal_votes.py
rename to api_tests/database_api/list_proposal_votes.py
diff --git a/hived/api_tests/database_api/list_proposals.py b/api_tests/database_api/list_proposals.py
similarity index 100%
rename from hived/api_tests/database_api/list_proposals.py
rename to api_tests/database_api/list_proposals.py
diff --git a/hived/api_tests/database_api/list_savings_withdrawals.py b/api_tests/database_api/list_savings_withdrawals.py
similarity index 100%
rename from hived/api_tests/database_api/list_savings_withdrawals.py
rename to api_tests/database_api/list_savings_withdrawals.py
diff --git a/hived/api_tests/database_api/list_smt_contributions.py b/api_tests/database_api/list_smt_contributions.py
similarity index 100%
rename from hived/api_tests/database_api/list_smt_contributions.py
rename to api_tests/database_api/list_smt_contributions.py
diff --git a/hived/api_tests/database_api/list_smt_token_emissions.py b/api_tests/database_api/list_smt_token_emissions.py
similarity index 100%
rename from hived/api_tests/database_api/list_smt_token_emissions.py
rename to api_tests/database_api/list_smt_token_emissions.py
diff --git a/hived/api_tests/database_api/list_smt_tokens.py b/api_tests/database_api/list_smt_tokens.py
similarity index 100%
rename from hived/api_tests/database_api/list_smt_tokens.py
rename to api_tests/database_api/list_smt_tokens.py
diff --git a/hived/api_tests/database_api/list_vesting_delegation_expirations.py b/api_tests/database_api/list_vesting_delegation_expirations.py
similarity index 100%
rename from hived/api_tests/database_api/list_vesting_delegation_expirations.py
rename to api_tests/database_api/list_vesting_delegation_expirations.py
diff --git a/hived/api_tests/database_api/list_vesting_delegations.py b/api_tests/database_api/list_vesting_delegations.py
similarity index 100%
rename from hived/api_tests/database_api/list_vesting_delegations.py
rename to api_tests/database_api/list_vesting_delegations.py
diff --git a/hived/api_tests/database_api/list_votes.py b/api_tests/database_api/list_votes.py
similarity index 100%
rename from hived/api_tests/database_api/list_votes.py
rename to api_tests/database_api/list_votes.py
diff --git a/hived/api_tests/database_api/list_withdraw_vesting_routes.py b/api_tests/database_api/list_withdraw_vesting_routes.py
similarity index 100%
rename from hived/api_tests/database_api/list_withdraw_vesting_routes.py
rename to api_tests/database_api/list_withdraw_vesting_routes.py
diff --git a/hived/api_tests/database_api/list_witness_votes.py b/api_tests/database_api/list_witness_votes.py
similarity index 100%
rename from hived/api_tests/database_api/list_witness_votes.py
rename to api_tests/database_api/list_witness_votes.py
diff --git a/hived/api_tests/database_api/list_witnesses.py b/api_tests/database_api/list_witnesses.py
similarity index 100%
rename from hived/api_tests/database_api/list_witnesses.py
rename to api_tests/database_api/list_witnesses.py
diff --git a/hived/api_tests/database_api/verify_account_authority.py b/api_tests/database_api/verify_account_authority.py
similarity index 100%
rename from hived/api_tests/database_api/verify_account_authority.py
rename to api_tests/database_api/verify_account_authority.py
diff --git a/hived/api_tests/database_api/verify_authority.py b/api_tests/database_api/verify_authority.py
similarity index 100%
rename from hived/api_tests/database_api/verify_authority.py
rename to api_tests/database_api/verify_authority.py
diff --git a/hived/api_tests/database_api/verify_signatures.py b/api_tests/database_api/verify_signatures.py
similarity index 100%
rename from hived/api_tests/database_api/verify_signatures.py
rename to api_tests/database_api/verify_signatures.py
diff --git a/hived/api_tests/get_ops_in_block.py b/api_tests/get_ops_in_block.py
similarity index 100%
rename from hived/api_tests/get_ops_in_block.py
rename to api_tests/get_ops_in_block.py
diff --git a/hived/api_tests/jsonrpc_api/CMakeLists.txt b/api_tests/jsonrpc_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/jsonrpc_api/CMakeLists.txt
rename to api_tests/jsonrpc_api/CMakeLists.txt
diff --git a/hived/api_tests/jsonrpc_api/README.md b/api_tests/jsonrpc_api/README.md
similarity index 100%
rename from hived/api_tests/jsonrpc_api/README.md
rename to api_tests/jsonrpc_api/README.md
diff --git a/hived/api_tests/jsonrpc_api/get_methods.py b/api_tests/jsonrpc_api/get_methods.py
similarity index 100%
rename from hived/api_tests/jsonrpc_api/get_methods.py
rename to api_tests/jsonrpc_api/get_methods.py
diff --git a/hived/api_tests/jsonrpc_api/get_signature.py b/api_tests/jsonrpc_api/get_signature.py
similarity index 100%
rename from hived/api_tests/jsonrpc_api/get_signature.py
rename to api_tests/jsonrpc_api/get_signature.py
diff --git a/hived/api_tests/list_account.py b/api_tests/list_account.py
similarity index 100%
rename from hived/api_tests/list_account.py
rename to api_tests/list_account.py
diff --git a/hived/api_tests/market_history_api/CMakeLists.txt b/api_tests/market_history_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/market_history_api/CMakeLists.txt
rename to api_tests/market_history_api/CMakeLists.txt
diff --git a/hived/api_tests/market_history_api/README.md b/api_tests/market_history_api/README.md
similarity index 100%
rename from hived/api_tests/market_history_api/README.md
rename to api_tests/market_history_api/README.md
diff --git a/hived/api_tests/market_history_api/get_market_history.py b/api_tests/market_history_api/get_market_history.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_market_history.py
rename to api_tests/market_history_api/get_market_history.py
diff --git a/hived/api_tests/market_history_api/get_market_history_buckets.py b/api_tests/market_history_api/get_market_history_buckets.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_market_history_buckets.py
rename to api_tests/market_history_api/get_market_history_buckets.py
diff --git a/hived/api_tests/market_history_api/get_order_book.py b/api_tests/market_history_api/get_order_book.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_order_book.py
rename to api_tests/market_history_api/get_order_book.py
diff --git a/hived/api_tests/market_history_api/get_recent_trades.py b/api_tests/market_history_api/get_recent_trades.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_recent_trades.py
rename to api_tests/market_history_api/get_recent_trades.py
diff --git a/hived/api_tests/market_history_api/get_ticker.py b/api_tests/market_history_api/get_ticker.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_ticker.py
rename to api_tests/market_history_api/get_ticker.py
diff --git a/hived/api_tests/market_history_api/get_trade_history.py b/api_tests/market_history_api/get_trade_history.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_trade_history.py
rename to api_tests/market_history_api/get_trade_history.py
diff --git a/hived/api_tests/market_history_api/get_volume.py b/api_tests/market_history_api/get_volume.py
similarity index 100%
rename from hived/api_tests/market_history_api/get_volume.py
rename to api_tests/market_history_api/get_volume.py
diff --git a/hived/api_tests/rc_api/CMakeLists.txt b/api_tests/rc_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/rc_api/CMakeLists.txt
rename to api_tests/rc_api/CMakeLists.txt
diff --git a/hived/api_tests/rc_api/find_rc_accounts.py b/api_tests/rc_api/find_rc_accounts.py
similarity index 100%
rename from hived/api_tests/rc_api/find_rc_accounts.py
rename to api_tests/rc_api/find_rc_accounts.py
diff --git a/hived/api_tests/rc_api/get_resource_params.py b/api_tests/rc_api/get_resource_params.py
similarity index 100%
rename from hived/api_tests/rc_api/get_resource_params.py
rename to api_tests/rc_api/get_resource_params.py
diff --git a/hived/api_tests/rc_api/get_resource_pool.py b/api_tests/rc_api/get_resource_pool.py
similarity index 100%
rename from hived/api_tests/rc_api/get_resource_pool.py
rename to api_tests/rc_api/get_resource_pool.py
diff --git a/hived/api_tests/rc_api/readme.md b/api_tests/rc_api/readme.md
similarity index 100%
rename from hived/api_tests/rc_api/readme.md
rename to api_tests/rc_api/readme.md
diff --git a/hived/api_tests/reputation_api/CMakeLists.txt b/api_tests/reputation_api/CMakeLists.txt
similarity index 100%
rename from hived/api_tests/reputation_api/CMakeLists.txt
rename to api_tests/reputation_api/CMakeLists.txt
diff --git a/hived/api_tests/reputation_api/get_account_reputations.py b/api_tests/reputation_api/get_account_reputations.py
similarity index 100%
rename from hived/api_tests/reputation_api/get_account_reputations.py
rename to api_tests/reputation_api/get_account_reputations.py
diff --git a/hived/api_tests/reputation_api/readme.md b/api_tests/reputation_api/readme.md
similarity index 100%
rename from hived/api_tests/reputation_api/readme.md
rename to api_tests/reputation_api/readme.md
diff --git a/hived/api_tests/sps_api_plugin.py b/api_tests/sps_api_plugin.py
similarity index 100%
rename from hived/api_tests/sps_api_plugin.py
rename to api_tests/sps_api_plugin.py
diff --git a/hived/api_tests/test_ah_get_account_history.py b/api_tests/test_ah_get_account_history.py
similarity index 100%
rename from hived/api_tests/test_ah_get_account_history.py
rename to api_tests/test_ah_get_account_history.py
diff --git a/hived/api_tests/test_ah_get_ops_in_block.py b/api_tests/test_ah_get_ops_in_block.py
similarity index 100%
rename from hived/api_tests/test_ah_get_ops_in_block.py
rename to api_tests/test_ah_get_ops_in_block.py
diff --git a/hived/hive_functional/CMakeLists.txt b/functional/CMakeLists.txt
similarity index 100%
rename from hived/hive_functional/CMakeLists.txt
rename to functional/CMakeLists.txt
diff --git a/hived/hive_functional/__init__.py b/functional/__init__.py
similarity index 100%
rename from hived/hive_functional/__init__.py
rename to functional/__init__.py
diff --git a/hived/hive_functional/hive_utils/__init__.py b/functional/hive_utils/__init__.py
similarity index 100%
rename from hived/hive_functional/hive_utils/__init__.py
rename to functional/hive_utils/__init__.py
diff --git a/hived/hive_functional/hive_utils/common.py b/functional/hive_utils/common.py
similarity index 100%
rename from hived/hive_functional/hive_utils/common.py
rename to functional/hive_utils/common.py
diff --git a/hived/hive_functional/hive_utils/hive_node.py b/functional/hive_utils/hive_node.py
similarity index 100%
rename from hived/hive_functional/hive_utils/hive_node.py
rename to functional/hive_utils/hive_node.py
diff --git a/hived/hive_functional/hive_utils/resources/config.ini.in b/functional/hive_utils/resources/config.ini.in
similarity index 100%
rename from hived/hive_functional/hive_utils/resources/config.ini.in
rename to functional/hive_utils/resources/config.ini.in
diff --git a/hived/hive_functional/python_tests/CMakeLists.txt b/functional/python_tests/CMakeLists.txt
similarity index 79%
rename from hived/hive_functional/python_tests/CMakeLists.txt
rename to functional/python_tests/CMakeLists.txt
index 0795962255816ce23f59b37c61cb3b80bd4f5860..ceaf42bc50f38027463360d0460a1496770a165b 100644
--- a/hived/hive_functional/python_tests/CMakeLists.txt
+++ b/functional/python_tests/CMakeLists.txt
@@ -1,19 +1,19 @@
 INCLUDE ( CTest )
 ENABLE_TESTING()
 
-SET ( python_funtional_tests_prefix hive_functional )
+SET ( python_funtional_tests_prefix functional )
 SET ( hived_path ${CMAKE_BINARY_DIR}/programs/hived/hived )
 SET ( initminer_key 5JNHfZYKGaomSFvd4NUdQ9qMcEAC43kujbfjueTHpVapX1Kzq2n )
 
 # It is required to start ctest in ${CMAKE_BINARY_DIR}/tests
-# The test are grouped as follow hive_functional/<subdirectory name>/<test_basefile_name>
-#   example: test script hive_functional/python_tests/dhf_tests/beem_dhf_tests.py will started with ctest as follows:
-#       ctest hive_functional/dhf_tests/beem_dhf_tests
+# The test are grouped as follow functional/<subdirectory name>/<test_basefile_name>
+#   example: test script functional/python_tests/dhf_tests/beem_dhf_tests.py will started with ctest as follows:
+#       ctest functional/dhf_tests/beem_dhf_tests
 # To start group of tests use ctest -R
 #   example: to start all tests in sps_tests group:
-#       ctest -R hive_functional/dhf_tests/.*
+#       ctest -R functional/dhf_tests/.*
 #   example: to start all python_functional tests:
-#       ctest -R hive_functional/.*
+#       ctest -R functional/.*
 
 MACRO ( ADD_PYTHON_FUNCTIONAL_TEST test_script_base_name )
     FILE( RELATIVE_PATH tests_subset "${CMAKE_CURRENT_SOURCE_DIR}/.." "${CMAKE_CURRENT_SOURCE_DIR}" )
diff --git a/hived/hive_functional/python_tests/cli_wallet/run.py b/functional/python_tests/cli_wallet/run.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/run.py
rename to functional/python_tests/cli_wallet/run.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/000_create_proposal.py b/functional/python_tests/cli_wallet/tests/000_create_proposal.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/000_create_proposal.py
rename to functional/python_tests/cli_wallet/tests/000_create_proposal.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/001_update_proposal.py b/functional/python_tests/cli_wallet/tests/001_update_proposal.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/001_update_proposal.py
rename to functional/python_tests/cli_wallet/tests/001_update_proposal.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/002_remove_proposal.py b/functional/python_tests/cli_wallet/tests/002_remove_proposal.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/002_remove_proposal.py
rename to functional/python_tests/cli_wallet/tests/002_remove_proposal.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/003_list_proposal.py b/functional/python_tests/cli_wallet/tests/003_list_proposal.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/003_list_proposal.py
rename to functional/python_tests/cli_wallet/tests/003_list_proposal.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/004_list_voter_proposal.py b/functional/python_tests/cli_wallet/tests/004_list_voter_proposal.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/004_list_voter_proposal.py
rename to functional/python_tests/cli_wallet/tests/004_list_voter_proposal.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/005_find_proposals.py b/functional/python_tests/cli_wallet/tests/005_find_proposals.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/005_find_proposals.py
rename to functional/python_tests/cli_wallet/tests/005_find_proposals.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/006_cli_wallet_help.py b/functional/python_tests/cli_wallet/tests/006_cli_wallet_help.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/006_cli_wallet_help.py
rename to functional/python_tests/cli_wallet/tests/006_cli_wallet_help.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/007_create_proposal_fail_negative_payment.py b/functional/python_tests/cli_wallet/tests/007_create_proposal_fail_negative_payment.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/007_create_proposal_fail_negative_payment.py
rename to functional/python_tests/cli_wallet/tests/007_create_proposal_fail_negative_payment.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/008_list_proposal_fail_invalid_value_for_last_id.py b/functional/python_tests/cli_wallet/tests/008_list_proposal_fail_invalid_value_for_last_id.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/008_list_proposal_fail_invalid_value_for_last_id.py
rename to functional/python_tests/cli_wallet/tests/008_list_proposal_fail_invalid_value_for_last_id.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/009_list_voter_proposal_fail_invalid_value_for_last_id.py b/functional/python_tests/cli_wallet/tests/009_list_voter_proposal_fail_invalid_value_for_last_id.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/009_list_voter_proposal_fail_invalid_value_for_last_id.py
rename to functional/python_tests/cli_wallet/tests/009_list_voter_proposal_fail_invalid_value_for_last_id.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/010_delayed_voting.py b/functional/python_tests/cli_wallet/tests/010_delayed_voting.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/010_delayed_voting.py
rename to functional/python_tests/cli_wallet/tests/010_delayed_voting.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/utils/cli_wallet.py b/functional/python_tests/cli_wallet/tests/utils/cli_wallet.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/utils/cli_wallet.py
rename to functional/python_tests/cli_wallet/tests/utils/cli_wallet.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/utils/cmd_args.py b/functional/python_tests/cli_wallet/tests/utils/cmd_args.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/utils/cmd_args.py
rename to functional/python_tests/cli_wallet/tests/utils/cmd_args.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/utils/logger.py b/functional/python_tests/cli_wallet/tests/utils/logger.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/utils/logger.py
rename to functional/python_tests/cli_wallet/tests/utils/logger.py
diff --git a/hived/hive_functional/python_tests/cli_wallet/tests/utils/test_utils.py b/functional/python_tests/cli_wallet/tests/utils/test_utils.py
similarity index 100%
rename from hived/hive_functional/python_tests/cli_wallet/tests/utils/test_utils.py
rename to functional/python_tests/cli_wallet/tests/utils/test_utils.py
diff --git a/hived/hive_functional/python_tests/comment_payment_tests/comment_payment_test_001.py b/functional/python_tests/comment_payment_tests/comment_payment_test_001.py
similarity index 100%
rename from hived/hive_functional/python_tests/comment_payment_tests/comment_payment_test_001.py
rename to functional/python_tests/comment_payment_tests/comment_payment_test_001.py
diff --git a/hived/hive_functional/python_tests/comment_payment_tests/comment_payment_test_002.py b/functional/python_tests/comment_payment_tests/comment_payment_test_002.py
similarity index 100%
rename from hived/hive_functional/python_tests/comment_payment_tests/comment_payment_test_002.py
rename to functional/python_tests/comment_payment_tests/comment_payment_test_002.py
diff --git a/hived/hive_functional/python_tests/comment_payment_tests/resources/config.extended.ini b/functional/python_tests/comment_payment_tests/resources/config.extended.ini
similarity index 100%
rename from hived/hive_functional/python_tests/comment_payment_tests/resources/config.extended.ini
rename to functional/python_tests/comment_payment_tests/resources/config.extended.ini
diff --git a/hived/hive_functional/python_tests/comment_payment_tests/resources/config.ini b/functional/python_tests/comment_payment_tests/resources/config.ini
similarity index 100%
rename from hived/hive_functional/python_tests/comment_payment_tests/resources/config.ini
rename to functional/python_tests/comment_payment_tests/resources/config.ini
diff --git a/hived/hive_functional/python_tests/comment_payment_tests/simulate_curve_payouts.py b/functional/python_tests/comment_payment_tests/simulate_curve_payouts.py
similarity index 100%
rename from hived/hive_functional/python_tests/comment_payment_tests/simulate_curve_payouts.py
rename to functional/python_tests/comment_payment_tests/simulate_curve_payouts.py
diff --git a/hived/hive_functional/python_tests/comment_payment_tests/test_utils.py b/functional/python_tests/comment_payment_tests/test_utils.py
similarity index 100%
rename from hived/hive_functional/python_tests/comment_payment_tests/test_utils.py
rename to functional/python_tests/comment_payment_tests/test_utils.py
diff --git a/hived/hive_functional/python_tests/delayed_votes_tests/basic_delayed_votes_test_001.py b/functional/python_tests/delayed_votes_tests/basic_delayed_votes_test_001.py
similarity index 100%
rename from hived/hive_functional/python_tests/delayed_votes_tests/basic_delayed_votes_test_001.py
rename to functional/python_tests/delayed_votes_tests/basic_delayed_votes_test_001.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/CMakeLists.txt b/functional/python_tests/dhf_tests/CMakeLists.txt
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/CMakeLists.txt
rename to functional/python_tests/dhf_tests/CMakeLists.txt
diff --git a/hived/hive_functional/python_tests/dhf_tests/beem_dhf_tests.py b/functional/python_tests/dhf_tests/beem_dhf_tests.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/beem_dhf_tests.py
rename to functional/python_tests/dhf_tests/beem_dhf_tests.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/id_collision_test.py b/functional/python_tests/dhf_tests/id_collision_test.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/id_collision_test.py
rename to functional/python_tests/dhf_tests/id_collision_test.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/list_proposals_tests.py b/functional/python_tests/dhf_tests/list_proposals_tests.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/list_proposals_tests.py
rename to functional/python_tests/dhf_tests/list_proposals_tests.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/list_voter_proposal_test.py b/functional/python_tests/dhf_tests/list_voter_proposal_test.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/list_voter_proposal_test.py
rename to functional/python_tests/dhf_tests/list_voter_proposal_test.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_benchmark_test.py b/functional/python_tests/dhf_tests/proposal_benchmark_test.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_benchmark_test.py
rename to functional/python_tests/dhf_tests/proposal_benchmark_test.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_001.py b/functional/python_tests/dhf_tests/proposal_payment_test_001.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_001.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_001.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_002.py b/functional/python_tests/dhf_tests/proposal_payment_test_002.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_002.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_002.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_003.py b/functional/python_tests/dhf_tests/proposal_payment_test_003.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_003.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_003.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_004.py b/functional/python_tests/dhf_tests/proposal_payment_test_004.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_004.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_004.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_005.py b/functional/python_tests/dhf_tests/proposal_payment_test_005.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_005.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_005.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_006.py b/functional/python_tests/dhf_tests/proposal_payment_test_006.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_006.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_006.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_007.py b/functional/python_tests/dhf_tests/proposal_payment_test_007.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_007.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_007.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_008.py b/functional/python_tests/dhf_tests/proposal_payment_test_008.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_008.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_008.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_009.py b/functional/python_tests/dhf_tests/proposal_payment_test_009.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/proposal_payment_test_009.py
rename to functional/python_tests/dhf_tests/proposal_payment_test_009.py
diff --git a/hived/hive_functional/python_tests/dhf_tests/test_utils.py b/functional/python_tests/dhf_tests/test_utils.py
similarity index 100%
rename from hived/hive_functional/python_tests/dhf_tests/test_utils.py
rename to functional/python_tests/dhf_tests/test_utils.py
diff --git a/hived/hive_functional/python_tests/hived/CMakeLists.txt b/functional/python_tests/hived/CMakeLists.txt
similarity index 100%
rename from hived/hive_functional/python_tests/hived/CMakeLists.txt
rename to functional/python_tests/hived/CMakeLists.txt
diff --git a/hived/hive_functional/python_tests/hived/hived_options_tests.py b/functional/python_tests/hived/hived_options_tests.py
similarity index 100%
rename from hived/hive_functional/python_tests/hived/hived_options_tests.py
rename to functional/python_tests/hived/hived_options_tests.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/account_history_api_test.yaml b/functional/python_tests/pyresttest_api_tests/account_history_api/account_history_api_test.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/account_history_api_test.yaml
rename to functional/python_tests/pyresttest_api_tests/account_history_api/account_history_api_test.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/get_account_history.json.pat b/functional/python_tests/pyresttest_api_tests/account_history_api/get_account_history.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/get_account_history.json.pat
rename to functional/python_tests/pyresttest_api_tests/account_history_api/get_account_history.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/get_ops_in_block.json.pat b/functional/python_tests/pyresttest_api_tests/account_history_api/get_ops_in_block.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/get_ops_in_block.json.pat
rename to functional/python_tests/pyresttest_api_tests/account_history_api/get_ops_in_block.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/request_template.json b/functional/python_tests/pyresttest_api_tests/account_history_api/request_template.json
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/account_history_api/request_template.json
rename to functional/python_tests/pyresttest_api_tests/account_history_api/request_template.json
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/basic_smoketest.yaml b/functional/python_tests/pyresttest_api_tests/basic_smoketest.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/basic_smoketest.yaml
rename to functional/python_tests/pyresttest_api_tests/basic_smoketest.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/comparator_appbase_ops.py b/functional/python_tests/pyresttest_api_tests/comparator_appbase_ops.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/comparator_appbase_ops.py
rename to functional/python_tests/pyresttest_api_tests/comparator_appbase_ops.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/comparator_contain.py b/functional/python_tests/pyresttest_api_tests/comparator_contain.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/comparator_contain.py
rename to functional/python_tests/pyresttest_api_tests/comparator_contain.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/comparator_equal.py b/functional/python_tests/pyresttest_api_tests/comparator_equal.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/comparator_equal.py
rename to functional/python_tests/pyresttest_api_tests/comparator_equal.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.json b/functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.json
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.json
rename to functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.json
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.yaml b/functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.yaml
rename to functional/python_tests/pyresttest_api_tests/compare_state/compare_block_appbase.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.json b/functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.json
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.json
rename to functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.json
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.yaml b/functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.yaml
rename to functional/python_tests/pyresttest_api_tests/compare_state/compare_block_old.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/compare_state_history.sh b/functional/python_tests/pyresttest_api_tests/compare_state_history.sh
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/compare_state_history.sh
rename to functional/python_tests/pyresttest_api_tests/compare_state_history.sh
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/find_proposals.json.pat b/functional/python_tests/pyresttest_api_tests/condenser_api/find_proposals.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/find_proposals.json.pat
rename to functional/python_tests/pyresttest_api_tests/condenser_api/find_proposals.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/list_proposals.json.pat b/functional/python_tests/pyresttest_api_tests/condenser_api/list_proposals.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/list_proposals.json.pat
rename to functional/python_tests/pyresttest_api_tests/condenser_api/list_proposals.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/list_voter_proposals.json.pat b/functional/python_tests/pyresttest_api_tests/condenser_api/list_voter_proposals.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/list_voter_proposals.json.pat
rename to functional/python_tests/pyresttest_api_tests/condenser_api/list_voter_proposals.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/request_template.json b/functional/python_tests/pyresttest_api_tests/condenser_api/request_template.json
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/request_template.json
rename to functional/python_tests/pyresttest_api_tests/condenser_api/request_template.json
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/sps_via_condenser_test.yaml b/functional/python_tests/pyresttest_api_tests/condenser_api/sps_via_condenser_test.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/condenser_api/sps_via_condenser_test.yaml
rename to functional/python_tests/pyresttest_api_tests/condenser_api/sps_via_condenser_test.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/database_api_test.yaml b/functional/python_tests/pyresttest_api_tests/database_api/database_api_test.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/database_api_test.yaml
rename to functional/python_tests/pyresttest_api_tests/database_api/database_api_test.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_config.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_config.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_config.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_config.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_current_price_feed.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_current_price_feed.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_current_price_feed.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_current_price_feed.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_dynamic_global_properties.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_dynamic_global_properties.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_dynamic_global_properties.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_dynamic_global_properties.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_feed_history.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_feed_history.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_feed_history.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_feed_history.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_hardfork_properties.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_hardfork_properties.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_hardfork_properties.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_hardfork_properties.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_reward_funds.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_reward_funds.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_reward_funds.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_reward_funds.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_witness_schedule.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/get_witness_schedule.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/get_witness_schedule.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/get_witness_schedule.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/list_witnesses.json.pat b/functional/python_tests/pyresttest_api_tests/database_api/list_witnesses.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/list_witnesses.json.pat
rename to functional/python_tests/pyresttest_api_tests/database_api/list_witnesses.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/database_api/request_template.json b/functional/python_tests/pyresttest_api_tests/database_api/request_template.json
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/database_api/request_template.json
rename to functional/python_tests/pyresttest_api_tests/database_api/request_template.json
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/jsonsocket.py b/functional/python_tests/pyresttest_api_tests/jsonsocket.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/jsonsocket.py
rename to functional/python_tests/pyresttest_api_tests/jsonsocket.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/list_account.py b/functional/python_tests/pyresttest_api_tests/list_account.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/list_account.py
rename to functional/python_tests/pyresttest_api_tests/list_account.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/run_api_tests.sh b/functional/python_tests/pyresttest_api_tests/run_api_tests.sh
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/run_api_tests.sh
rename to functional/python_tests/pyresttest_api_tests/run_api_tests.sh
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/find_proposals.json.pat b/functional/python_tests/pyresttest_api_tests/sps_api/find_proposals.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/find_proposals.json.pat
rename to functional/python_tests/pyresttest_api_tests/sps_api/find_proposals.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/list_proposals.json.pat b/functional/python_tests/pyresttest_api_tests/sps_api/list_proposals.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/list_proposals.json.pat
rename to functional/python_tests/pyresttest_api_tests/sps_api/list_proposals.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/list_voter_proposals.json.pat b/functional/python_tests/pyresttest_api_tests/sps_api/list_voter_proposals.json.pat
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/list_voter_proposals.json.pat
rename to functional/python_tests/pyresttest_api_tests/sps_api/list_voter_proposals.json.pat
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/request_template.json b/functional/python_tests/pyresttest_api_tests/sps_api/request_template.json
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/request_template.json
rename to functional/python_tests/pyresttest_api_tests/sps_api/request_template.json
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/sps_api_test.yaml b/functional/python_tests/pyresttest_api_tests/sps_api/sps_api_test.yaml
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/sps_api/sps_api_test.yaml
rename to functional/python_tests/pyresttest_api_tests/sps_api/sps_api_test.yaml
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/test_ah_get_account_history.py b/functional/python_tests/pyresttest_api_tests/test_ah_get_account_history.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/test_ah_get_account_history.py
rename to functional/python_tests/pyresttest_api_tests/test_ah_get_account_history.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/test_ah_get_ops_in_block.py b/functional/python_tests/pyresttest_api_tests/test_ah_get_ops_in_block.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/test_ah_get_ops_in_block.py
rename to functional/python_tests/pyresttest_api_tests/test_ah_get_ops_in_block.py
diff --git a/hived/hive_functional/python_tests/pyresttest_api_tests/validator_ex.py b/functional/python_tests/pyresttest_api_tests/validator_ex.py
similarity index 100%
rename from hived/hive_functional/python_tests/pyresttest_api_tests/validator_ex.py
rename to functional/python_tests/pyresttest_api_tests/validator_ex.py