gnoswap-labs · dongwon8247 · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → contract/p/gnoswap/gnsmath/_helper_test.gno b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → contract/p/gnoswap/gnsmath/_helper_test.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	"testing"

diff --git a/contract/p/gnoswap/pool/bit_math.gno → contract/p/gnoswap/gnsmath/bit_math.gno b/contract/p/gnoswap/pool/bit_math.gno → contract/p/gnoswap/gnsmath/bit_math.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	u256 "gno.land/p/gnoswap/uint256"

diff --git a/.../p/gnoswap/pool/__TEST_bit_math_test.gnoA → contract/p/gnoswap/gnsmath/bit_math_test.gno b/.../p/gnoswap/pool/__TEST_bit_math_test.gnoA → contract/p/gnoswap/gnsmath/bit_math_test.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	"testing"

diff --git a/contract/p/gnoswap/pool/consts.gno → contract/p/gnoswap/gnsmath/consts.gno b/contract/p/gnoswap/pool/consts.gno → contract/p/gnoswap/gnsmath/consts.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 const (
 	MAX_UINT8   string = "255"

diff --git a/contract/p/gnoswap/gnsmath/gno.mod b/contract/p/gnoswap/gnsmath/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/gnoswap/gnsmath
diff --git a/contract/p/gnoswap/pool/sqrt_price_math.gno → ...act/p/gnoswap/gnsmath/sqrt_price_math.gno b/contract/p/gnoswap/pool/sqrt_price_math.gno → ...act/p/gnoswap/gnsmath/sqrt_price_math.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	i256 "gno.land/p/gnoswap/int256"

diff --git a/...t/p/gnoswap/pool/sqrt_price_math_test.gno → .../gnoswap/gnsmath/sqrt_price_math_test.gno b/...t/p/gnoswap/pool/sqrt_price_math_test.gno → .../gnoswap/gnsmath/sqrt_price_math_test.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	"testing"

diff --git a/contract/p/gnoswap/pool/swap_math.gno → contract/p/gnoswap/gnsmath/swap_math.gno b/contract/p/gnoswap/pool/swap_math.gno → contract/p/gnoswap/gnsmath/swap_math.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	i256 "gno.land/p/gnoswap/int256"

diff --git a/contract/p/gnoswap/pool/swap_math_test.gno → ...ract/p/gnoswap/gnsmath/swap_math_test.gno b/contract/p/gnoswap/pool/swap_math_test.gno → ...ract/p/gnoswap/gnsmath/swap_math_test.gno
@@ -1,4 +1,4 @@
-package pool
+package gnsmath
 
 import (
 	"testing"

diff --git a/contract/p/gnoswap/pool/gno.mod b/contract/p/gnoswap/pool/gno.mod
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → contract/p/gnoswap/uint256/_helper_test.gno b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → contract/p/gnoswap/uint256/_helper_test.gno
diff --git a/...ct/p/gnoswap/uint256/__TEST_u256_test.gno → contract/p/gnoswap/uint256/uint256_test.gno b/...ct/p/gnoswap/uint256/__TEST_u256_test.gno → contract/p/gnoswap/uint256/uint256_test.gno
diff --git a/contract/r/gnoswap/v1/common/access.gno → contract/r/gnoswap/common/access.gno b/contract/r/gnoswap/v1/common/access.gno → contract/r/gnoswap/common/access.gno
diff --git a/contract/r/gnoswap/v1/common/access_test.gno → contract/r/gnoswap/common/access_test.gno b/contract/r/gnoswap/v1/common/access_test.gno → contract/r/gnoswap/common/access_test.gno
diff --git a/...noswap/v1/common/address_and_username.gno → ...r/gnoswap/common/address_and_username.gno b/...noswap/v1/common/address_and_username.gno → ...r/gnoswap/common/address_and_username.gno
diff --git a/...p/v1/common/address_and_username_test.gno → ...swap/common/address_and_username_test.gno b/...p/v1/common/address_and_username_test.gno → ...swap/common/address_and_username_test.gno
diff --git a/contract/r/gnoswap/v1/common/errors.gno → contract/r/gnoswap/common/errors.gno b/contract/r/gnoswap/v1/common/errors.gno → contract/r/gnoswap/common/errors.gno
diff --git a/contract/r/gnoswap/v1/common/gno.mod → contract/r/gnoswap/common/gno.mod b/contract/r/gnoswap/v1/common/gno.mod → contract/r/gnoswap/common/gno.mod
diff --git a/...t/r/gnoswap/v1/common/grc20reg_helper.gno → ...ract/r/gnoswap/common/grc20reg_helper.gno b/...t/r/gnoswap/v1/common/grc20reg_helper.gno → ...ract/r/gnoswap/common/grc20reg_helper.gno
diff --git a/...noswap/v1/common/grc20reg_helper_test.gno → ...r/gnoswap/common/grc20reg_helper_test.gno b/...noswap/v1/common/grc20reg_helper_test.gno → ...r/gnoswap/common/grc20reg_helper_test.gno
diff --git a/...t/r/gnoswap/v1/common/grc721_token_id.gno → ...ract/r/gnoswap/common/grc721_token_id.gno b/...t/r/gnoswap/v1/common/grc721_token_id.gno → ...ract/r/gnoswap/common/grc721_token_id.gno
diff --git a/...noswap/v1/common/grc721_token_id_test.gno → ...r/gnoswap/common/grc721_token_id_test.gno b/...noswap/v1/common/grc721_token_id_test.gno → ...r/gnoswap/common/grc721_token_id_test.gno
diff --git a/contract/r/gnoswap/v1/common/halt.gno → contract/r/gnoswap/common/halt.gno b/contract/r/gnoswap/v1/common/halt.gno → contract/r/gnoswap/common/halt.gno
diff --git a/contract/r/gnoswap/v1/common/halt_test.gno → contract/r/gnoswap/common/halt_test.gno b/contract/r/gnoswap/v1/common/halt_test.gno → contract/r/gnoswap/common/halt_test.gno
diff --git a/...ract/r/gnoswap/v1/common/limit_caller.gno → contract/r/gnoswap/common/limit_caller.gno b/...ract/r/gnoswap/v1/common/limit_caller.gno → contract/r/gnoswap/common/limit_caller.gno
diff --git a/...r/gnoswap/v1/common/limit_caller_test.gno → ...ct/r/gnoswap/common/limit_caller_test.gno b/...r/gnoswap/v1/common/limit_caller_test.gno → ...ct/r/gnoswap/common/limit_caller_test.gno
diff --git a/...r/gnoswap/v1/common/liquidity_amounts.gno → ...ct/r/gnoswap/common/liquidity_amounts.gno b/...r/gnoswap/v1/common/liquidity_amounts.gno → ...ct/r/gnoswap/common/liquidity_amounts.gno
diff --git a/...swap/v1/common/liquidity_amounts_test.gno → ...gnoswap/common/liquidity_amounts_test.gno b/...swap/v1/common/liquidity_amounts_test.gno → ...gnoswap/common/liquidity_amounts_test.gno
diff --git a/contract/r/gnoswap/v1/common/math.gno → contract/r/gnoswap/common/math.gno b/contract/r/gnoswap/v1/common/math.gno → contract/r/gnoswap/common/math.gno
diff --git a/contract/r/gnoswap/v1/common/math_test.gno → contract/r/gnoswap/common/math_test.gno b/contract/r/gnoswap/v1/common/math_test.gno → contract/r/gnoswap/common/math_test.gno
diff --git a/contract/r/gnoswap/v1/common/strings.gno → contract/r/gnoswap/common/strings.gno b/contract/r/gnoswap/v1/common/strings.gno → contract/r/gnoswap/common/strings.gno
diff --git a/contract/r/gnoswap/v1/common/tick_math.gno → contract/r/gnoswap/common/tick_math.gno b/contract/r/gnoswap/v1/common/tick_math.gno → contract/r/gnoswap/common/tick_math.gno
diff --git a/...ct/r/gnoswap/v1/common/tick_math_test.gno → contract/r/gnoswap/common/tick_math_test.gno b/...ct/r/gnoswap/v1/common/tick_math_test.gno → contract/r/gnoswap/common/tick_math_test.gno
diff --git a/contract/r/gnoswap/v1/common/util.gno → contract/r/gnoswap/common/util.gno b/contract/r/gnoswap/v1/common/util.gno → contract/r/gnoswap/common/util.gno
diff --git a/...swap/v1/community_pool/community_pool.gno → ...gnoswap/community_pool/community_pool.gno b/...swap/v1/community_pool/community_pool.gno → ...gnoswap/community_pool/community_pool.gno
diff --git a/...v1/community_pool/community_pool_test.gno → ...ap/community_pool/community_pool_test.gno b/...v1/community_pool/community_pool_test.gno → ...ap/community_pool/community_pool_test.gno
diff --git a/...ct/r/gnoswap/v1/community_pool/errors.gno → contract/r/gnoswap/community_pool/errors.gno b/...ct/r/gnoswap/v1/community_pool/errors.gno → contract/r/gnoswap/community_pool/errors.gno
diff --git a/contract/r/gnoswap/v1/community_pool/gno.mod → contract/r/gnoswap/community_pool/gno.mod b/contract/r/gnoswap/v1/community_pool/gno.mod → contract/r/gnoswap/community_pool/gno.mod
diff --git a/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ...y_pool/tests/init_token_register_test.gno b/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ...y_pool/tests/init_token_register_test.gno
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...l/tests/init_variable_and_helper_test.gno b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...l/tests/init_variable_and_helper_test.gno
diff --git a/contract/r/gnoswap/v1/consts/consts.gno → contract/r/gnoswap/consts/consts.gno b/contract/r/gnoswap/v1/consts/consts.gno → contract/r/gnoswap/consts/consts.gno
diff --git a/contract/r/gnoswap/v1/consts/gno.mod → contract/r/gnoswap/consts/gno.mod b/contract/r/gnoswap/v1/consts/gno.mod → contract/r/gnoswap/consts/gno.mod
diff --git a/...ct/r/gnoswap/v1/emission/_test_helper.gno → contract/r/gnoswap/emission/_test_helper.gno b/...ct/r/gnoswap/v1/emission/_test_helper.gno → contract/r/gnoswap/emission/_test_helper.gno
diff --git a/contract/r/gnoswap/v1/emission/callback.gno → contract/r/gnoswap/emission/callback.gno b/contract/r/gnoswap/v1/emission/callback.gno → contract/r/gnoswap/emission/callback.gno
diff --git a/...ct/r/gnoswap/v1/emission/distribution.gno → contract/r/gnoswap/emission/distribution.gno b/...ct/r/gnoswap/v1/emission/distribution.gno → contract/r/gnoswap/emission/distribution.gno
diff --git a/...gnoswap/v1/emission/distribution_test.gno → .../r/gnoswap/emission/distribution_test.gno b/...gnoswap/v1/emission/distribution_test.gno → .../r/gnoswap/emission/distribution_test.gno
diff --git a/contract/r/gnoswap/v1/emission/emission.gno → contract/r/gnoswap/emission/emission.gno b/contract/r/gnoswap/v1/emission/emission.gno → contract/r/gnoswap/emission/emission.gno
diff --git a/...t/r/gnoswap/v1/emission/emission_test.gno → ...ract/r/gnoswap/emission/emission_test.gno b/...t/r/gnoswap/v1/emission/emission_test.gno → ...ract/r/gnoswap/emission/emission_test.gno
diff --git a/contract/r/gnoswap/v1/emission/errors.gno → contract/r/gnoswap/emission/errors.gno b/contract/r/gnoswap/v1/emission/errors.gno → contract/r/gnoswap/emission/errors.gno
diff --git a/contract/r/gnoswap/v1/emission/gno.mod → contract/r/gnoswap/emission/gno.mod b/contract/r/gnoswap/v1/emission/gno.mod → contract/r/gnoswap/emission/gno.mod
diff --git a/contract/r/gnoswap/v1/emission/utils.gno → contract/r/gnoswap/emission/utils.gno b/contract/r/gnoswap/v1/emission/utils.gno → contract/r/gnoswap/emission/utils.gno
diff --git a/contract/r/gnoswap/v1/gnft/errors.gno → contract/r/gnoswap/gnft/errors.gno b/contract/r/gnoswap/v1/gnft/errors.gno → contract/r/gnoswap/gnft/errors.gno
diff --git a/contract/r/gnoswap/v1/gnft/gnft.gno → contract/r/gnoswap/gnft/gnft.gno b/contract/r/gnoswap/v1/gnft/gnft.gno → contract/r/gnoswap/gnft/gnft.gno
diff --git a/contract/r/gnoswap/v1/gnft/gnft_test.gno → contract/r/gnoswap/gnft/gnft_test.gno b/contract/r/gnoswap/v1/gnft/gnft_test.gno → contract/r/gnoswap/gnft/gnft_test.gno
diff --git a/contract/r/gnoswap/v1/gnft/gno.mod → contract/r/gnoswap/gnft/gno.mod b/contract/r/gnoswap/v1/gnft/gno.mod → contract/r/gnoswap/gnft/gno.mod
diff --git a/contract/r/gnoswap/v1/gnft/svg_generator.gno → contract/r/gnoswap/gnft/svg_generator.gno b/contract/r/gnoswap/v1/gnft/svg_generator.gno → contract/r/gnoswap/gnft/svg_generator.gno
diff --git a/.../r/gnoswap/v1/gnft/svg_generator_test.gno → ...act/r/gnoswap/gnft/svg_generator_test.gno b/.../r/gnoswap/v1/gnft/svg_generator_test.gno → ...act/r/gnoswap/gnft/svg_generator_test.gno
diff --git a/contract/r/gnoswap/v1/gnft/utils.gno → contract/r/gnoswap/gnft/utils.gno b/contract/r/gnoswap/v1/gnft/utils.gno → contract/r/gnoswap/gnft/utils.gno
diff --git a/contract/r/gnoswap/v1/gns/_helper_test.gno → contract/r/gnoswap/gns/_helper_test.gno b/contract/r/gnoswap/v1/gns/_helper_test.gno → contract/r/gnoswap/gns/_helper_test.gno
diff --git a/contract/r/gnoswap/v1/gns/errors.gno → contract/r/gnoswap/gns/errors.gno b/contract/r/gnoswap/v1/gns/errors.gno → contract/r/gnoswap/gns/errors.gno
diff --git a/contract/r/gnoswap/v1/gns/gno.mod → contract/r/gnoswap/gns/gno.mod b/contract/r/gnoswap/v1/gns/gno.mod → contract/r/gnoswap/gns/gno.mod
diff --git a/contract/r/gnoswap/v1/gns/gns.gno → contract/r/gnoswap/gns/gns.gno b/contract/r/gnoswap/v1/gns/gns.gno → contract/r/gnoswap/gns/gns.gno
diff --git a/contract/r/gnoswap/v1/gns/gns_test.gno → contract/r/gnoswap/gns/gns_test.gno b/contract/r/gnoswap/v1/gns/gns_test.gno → contract/r/gnoswap/gns/gns_test.gno
diff --git a/contract/r/gnoswap/v1/gns/halving.gno → contract/r/gnoswap/gns/halving.gno b/contract/r/gnoswap/v1/gns/halving.gno → contract/r/gnoswap/gns/halving.gno
diff --git a/contract/r/gnoswap/v1/gns/halving_test.gno → contract/r/gnoswap/gns/halving_test.gno b/contract/r/gnoswap/v1/gns/halving_test.gno → contract/r/gnoswap/gns/halving_test.gno
diff --git a/...ns/tests/gns_calculate_and_mint_test.gnoA → ...ns/tests/gns_calculate_and_mint_test.gnoA b/...ns/tests/gns_calculate_and_mint_test.gnoA → ...ns/tests/gns_calculate_and_mint_test.gnoA
diff --git a/...minted_and_left_emission_amount_test.gnoA → ...minted_and_left_emission_amount_test.gnoA b/...minted_and_left_emission_amount_test.gnoA → ...minted_and_left_emission_amount_test.gnoA
diff --git a/...ct/r/gnoswap/v1/gns/tests/z1_filetest.gno → contract/r/gnoswap/gns/tests/z1_filetest.gno b/...ct/r/gnoswap/v1/gns/tests/z1_filetest.gno → contract/r/gnoswap/gns/tests/z1_filetest.gno
diff --git a/...ct/r/gnoswap/v1/gns/tests/z2_filetest.gno → contract/r/gnoswap/gns/tests/z2_filetest.gno b/...ct/r/gnoswap/v1/gns/tests/z2_filetest.gno → contract/r/gnoswap/gns/tests/z2_filetest.gno
diff --git a/...ct/r/gnoswap/v1/gns/tests/z3_filetest.gno → contract/r/gnoswap/gns/tests/z3_filetest.gno b/...ct/r/gnoswap/v1/gns/tests/z3_filetest.gno → contract/r/gnoswap/gns/tests/z3_filetest.gno
diff --git a/...ct/r/gnoswap/v1/gns/tests/z4_filetest.gno → contract/r/gnoswap/gns/tests/z4_filetest.gno b/...ct/r/gnoswap/v1/gns/tests/z4_filetest.gno → contract/r/gnoswap/gns/tests/z4_filetest.gno
diff --git a/contract/r/gnoswap/v1/gns/utils.gno → contract/r/gnoswap/gns/utils.gno b/contract/r/gnoswap/v1/gns/utils.gno → contract/r/gnoswap/gns/utils.gno
diff --git a/contract/r/gnoswap/v1/gov/doc.gno → contract/r/gnoswap/gov/doc.gno b/contract/r/gnoswap/v1/gov/doc.gno → contract/r/gnoswap/gov/doc.gno
diff --git a/contract/r/gnoswap/v1/gov/governance/api.gno → contract/r/gnoswap/gov/governance/api.gno b/contract/r/gnoswap/v1/gov/governance/api.gno → contract/r/gnoswap/gov/governance/api.gno
diff --git a/.../r/gnoswap/v1/gov/governance/api_test.gno → ...act/r/gnoswap/gov/governance/api_test.gno b/.../r/gnoswap/v1/gov/governance/api_test.gno → ...act/r/gnoswap/gov/governance/api_test.gno
diff --git a/...ct/r/gnoswap/v1/gov/governance/config.gno → contract/r/gnoswap/gov/governance/config.gno b/...ct/r/gnoswap/v1/gov/governance/config.gno → contract/r/gnoswap/gov/governance/config.gno
diff --git a/...gnoswap/v1/gov/governance/config_test.gno → .../r/gnoswap/gov/governance/config_test.gno b/...gnoswap/v1/gov/governance/config_test.gno → .../r/gnoswap/gov/governance/config_test.gno
diff --git a/...ct/r/gnoswap/v1/gov/governance/errors.gno → contract/r/gnoswap/gov/governance/errors.gno b/...ct/r/gnoswap/v1/gov/governance/errors.gno → contract/r/gnoswap/gov/governance/errors.gno
diff --git a/...t/r/gnoswap/v1/gov/governance/execute.gno → ...ract/r/gnoswap/gov/governance/execute.gno b/...t/r/gnoswap/v1/gov/governance/execute.gno → ...ract/r/gnoswap/gov/governance/execute.gno
diff --git a/...noswap/v1/gov/governance/execute_test.gno → ...r/gnoswap/gov/governance/execute_test.gno b/...noswap/v1/gov/governance/execute_test.gno → ...r/gnoswap/gov/governance/execute_test.gno
diff --git a/...gnoswap/v1/gov/governance/fn_registry.gno → .../r/gnoswap/gov/governance/fn_registry.gno b/...gnoswap/v1/gov/governance/fn_registry.gno → .../r/gnoswap/gov/governance/fn_registry.gno
diff --git a/...ap/v1/gov/governance/fn_registry_test.gno → ...oswap/gov/governance/fn_registry_test.gno b/...ap/v1/gov/governance/fn_registry_test.gno → ...oswap/gov/governance/fn_registry_test.gno
diff --git a/...wap/v1/gov/governance/getter_proposal.gno → ...noswap/gov/governance/getter_proposal.gno b/...wap/v1/gov/governance/getter_proposal.gno → ...noswap/gov/governance/getter_proposal.gno
diff --git a/...gnoswap/v1/gov/governance/getter_vote.gno → .../r/gnoswap/gov/governance/getter_vote.gno b/...gnoswap/v1/gov/governance/getter_vote.gno → .../r/gnoswap/gov/governance/getter_vote.gno
diff --git a/contract/r/gnoswap/v1/gov/governance/gno.mod → contract/r/gnoswap/gov/governance/gno.mod b/contract/r/gnoswap/v1/gov/governance/gno.mod → contract/r/gnoswap/gov/governance/gno.mod
diff --git a/.../r/gnoswap/v1/gov/governance/proposal.gno → ...act/r/gnoswap/gov/governance/proposal.gno b/.../r/gnoswap/v1/gov/governance/proposal.gno → ...act/r/gnoswap/gov/governance/proposal.gno
diff --git a/...oswap/v1/gov/governance/proposal_test.gno → .../gnoswap/gov/governance/proposal_test.gno b/...oswap/v1/gov/governance/proposal_test.gno → .../gnoswap/gov/governance/proposal_test.gno
diff --git a/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ...nce/tests/_0_init_token_register_test.gno b/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ...nce/tests/_0_init_token_register_test.gno
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...wap/gov/governance/tests/_helper_test.gno b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...wap/gov/governance/tests/_helper_test.gno
diff --git a/...vernance_proposal_MULTI_execute_test.gnoA → ...vernance_proposal_MULTI_execute_test.gnoA b/...vernance_proposal_MULTI_execute_test.gnoA → ...vernance_proposal_MULTI_execute_test.gnoA
diff --git a/...e_proposal_community_pool_spend_test.gnoA → ...e_proposal_community_pool_spend_test.gnoA b/...e_proposal_community_pool_spend_test.gnoA → ...e_proposal_community_pool_spend_test.gnoA
@@ -1,11 +1,10 @@
 package governance
 
 import (
-	"strconv"
 	"std"
+	"strconv"
 	"testing"
 
-	"gno.land/p/demo/avl"
 	"gno.land/p/demo/testutils"
 	"gno.land/p/demo/uassert"
 

diff --git a/...EST_governance_proposal_execute_test.gnoA → ...sts/governance_proposal_execute_test.gnoA b/...EST_governance_proposal_execute_test.gnoA → ...sts/governance_proposal_execute_test.gnoA
diff --git a/...vernance_proposal_status_update_test.gnoA → ...vernance_proposal_status_update_test.gnoA b/...vernance_proposal_status_update_test.gnoA → ...vernance_proposal_status_update_test.gnoA
diff --git a/...__TEST_governance_proposal_text_test.gnoA → .../tests/governance_proposal_text_test.gnoA b/...__TEST_governance_proposal_text_test.gnoA → .../tests/governance_proposal_text_test.gnoA
diff --git a/...T_governance_vote_gov_delegated_test.gnoA → ...s/governance_vote_gov_delegated_test.gnoA b/...T_governance_vote_gov_delegated_test.gnoA → ...s/governance_vote_gov_delegated_test.gnoA
diff --git a/...gated_after_propose_before_vote_test.gnoA → ...gated_after_propose_before_vote_test.gnoA b/...gated_after_propose_before_vote_test.gnoA → ...gated_after_propose_before_vote_test.gnoA
diff --git a/...ated_undelegated_before_propose_test.gnoA → ...ated_undelegated_before_propose_test.gnoA b/...ated_undelegated_before_propose_test.gnoA → ...ated_undelegated_before_propose_test.gnoA
diff --git a/...rnance_vote_with_launchpad_xgns_test.gnoA → ...rnance_vote_with_launchpad_xgns_test.gnoA b/...rnance_vote_with_launchpad_xgns_test.gnoA → ...rnance_vote_with_launchpad_xgns_test.gnoA
diff --git a/...ract/r/gnoswap/v1/gov/governance/type.gno → contract/r/gnoswap/gov/governance/type.gno b/...ract/r/gnoswap/v1/gov/governance/type.gno → contract/r/gnoswap/gov/governance/type.gno
diff --git a/...act/r/gnoswap/v1/gov/governance/utils.gno → contract/r/gnoswap/gov/governance/utils.gno b/...act/r/gnoswap/v1/gov/governance/utils.gno → contract/r/gnoswap/gov/governance/utils.gno
diff --git a/...ract/r/gnoswap/v1/gov/governance/vote.gno → contract/r/gnoswap/gov/governance/vote.gno b/...ract/r/gnoswap/v1/gov/governance/vote.gno → contract/r/gnoswap/gov/governance/vote.gno
diff --git a/...r/gnoswap/v1/gov/governance/vote_test.gno → ...ct/r/gnoswap/gov/governance/vote_test.gno b/...r/gnoswap/v1/gov/governance/vote_test.gno → ...ct/r/gnoswap/gov/governance/vote_test.gno
diff --git a/.../gnoswap/v1/gov/staker/api_delegation.gno → ...t/r/gnoswap/gov/staker/api_delegation.gno b/.../gnoswap/v1/gov/staker/api_delegation.gno → ...t/r/gnoswap/gov/staker/api_delegation.gno
diff --git a/...t/r/gnoswap/v1/gov/staker/api_history.gno → ...ract/r/gnoswap/gov/staker/api_history.gno b/...t/r/gnoswap/v1/gov/staker/api_history.gno → ...ract/r/gnoswap/gov/staker/api_history.gno
diff --git a/...ct/r/gnoswap/v1/gov/staker/api_staker.gno → contract/r/gnoswap/gov/staker/api_staker.gno b/...ct/r/gnoswap/v1/gov/staker/api_staker.gno → contract/r/gnoswap/gov/staker/api_staker.gno
diff --git a/...gnoswap/v1/gov/staker/api_staker_test.gno → .../r/gnoswap/gov/staker/api_staker_test.gno b/...gnoswap/v1/gov/staker/api_staker_test.gno → .../r/gnoswap/gov/staker/api_staker_test.gno
diff --git a/.../staker/clean_delegation_stat_history.gno → .../staker/clean_delegation_stat_history.gno b/.../staker/clean_delegation_stat_history.gno → .../staker/clean_delegation_stat_history.gno
diff --git a/...er/clean_delegation_stat_history_test.gno → ...er/clean_delegation_stat_history_test.gno b/...er/clean_delegation_stat_history_test.gno → ...er/clean_delegation_stat_history_test.gno
diff --git a/...wap/v1/gov/staker/delegate_undelegate.gno → ...noswap/gov/staker/delegate_undelegate.gno b/...wap/v1/gov/staker/delegate_undelegate.gno → ...noswap/gov/staker/delegate_undelegate.gno
diff --git a/...1/gov/staker/delegate_undelegate_test.gno → ...p/gov/staker/delegate_undelegate_test.gno b/...1/gov/staker/delegate_undelegate_test.gno → ...p/gov/staker/delegate_undelegate_test.gno
diff --git a/contract/r/gnoswap/v1/gov/staker/errors.gno → contract/r/gnoswap/gov/staker/errors.gno b/contract/r/gnoswap/v1/gov/staker/errors.gno → contract/r/gnoswap/gov/staker/errors.gno
diff --git a/contract/r/gnoswap/v1/gov/staker/gno.mod → contract/r/gnoswap/gov/staker/gno.mod b/contract/r/gnoswap/v1/gov/staker/gno.mod → contract/r/gnoswap/gov/staker/gno.mod
diff --git a/contract/r/gnoswap/v1/gov/staker/history.gno → contract/r/gnoswap/gov/staker/history.gno b/contract/r/gnoswap/v1/gov/staker/history.gno → contract/r/gnoswap/gov/staker/history.gno
diff --git a/.../r/gnoswap/v1/gov/staker/history_test.gno → ...act/r/gnoswap/gov/staker/history_test.gno b/.../r/gnoswap/v1/gov/staker/history_test.gno → ...act/r/gnoswap/gov/staker/history_test.gno
diff --git a/...swap/v1/gov/staker/reward_calculation.gno → ...gnoswap/gov/staker/reward_calculation.gno b/...swap/v1/gov/staker/reward_calculation.gno → ...gnoswap/gov/staker/reward_calculation.gno
diff --git a/...v1/gov/staker/reward_calculation_test.gno → ...ap/gov/staker/reward_calculation_test.gno b/...v1/gov/staker/reward_calculation_test.gno → ...ap/gov/staker/reward_calculation_test.gno
diff --git a/contract/r/gnoswap/v1/gov/staker/staker.gno → contract/r/gnoswap/gov/staker/staker.gno b/contract/r/gnoswap/v1/gov/staker/staker.gno → contract/r/gnoswap/gov/staker/staker.gno
diff --git a/...t/r/gnoswap/v1/gov/staker/staker_test.gno → ...ract/r/gnoswap/gov/staker/staker_test.gno b/...t/r/gnoswap/v1/gov/staker/staker_test.gno → ...ract/r/gnoswap/gov/staker/staker_test.gno
diff --git a/...ts/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA → ...er/tests/_0_init_token_register_test.gnoA b/...ts/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA → ...er/tests/_0_init_token_register_test.gnoA
diff --git a/...TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA → ...noswap/gov/staker/tests/_helper_test.gnoA b/...TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA → ...noswap/gov/staker/tests/_helper_test.gnoA
diff --git a/.../v1/gov/staker/tests/__TEST_api_test.gnoA → .../r/gnoswap/gov/staker/tests/api_test.gnoA b/.../v1/gov/staker/tests/__TEST_api_test.gnoA → .../r/gnoswap/gov/staker/tests/api_test.gnoA
diff --git a/...s/clean_delegation_stat_history_test.gnoA → ...s/clean_delegation_stat_history_test.gnoA b/...s/clean_delegation_stat_history_test.gnoA → ...s/clean_delegation_stat_history_test.gnoA
diff --git a/.../tests/__TEST_emission_gns_mint_test.gnoA → .../staker/tests/emission_gns_mint_test.gnoA b/.../tests/__TEST_emission_gns_mint_test.gnoA → .../staker/tests/emission_gns_mint_test.gnoA
diff --git a/...TEST_governance_reward_emission_test.gnoA → ...ests/governance_reward_emission_test.gnoA b/...TEST_governance_reward_emission_test.gnoA → ...ests/governance_reward_emission_test.gnoA
diff --git a/..._governance_reward_protocol_fee_test.gnoA → .../governance_reward_protocol_fee_test.gnoA b/..._governance_reward_protocol_fee_test.gnoA → .../governance_reward_protocol_fee_test.gnoA
diff --git a/...ard_protocol_fee_with_launchpad_test.gnoA → ...ard_protocol_fee_with_launchpad_test.gnoA b/...ard_protocol_fee_with_launchpad_test.gnoA → ...ard_protocol_fee_with_launchpad_test.gnoA
diff --git a/...wap/v1/gov/staker/tests/history_test.gnoA → ...noswap/gov/staker/tests/history_test.gnoA b/...wap/v1/gov/staker/tests/history_test.gnoA → ...noswap/gov/staker/tests/history_test.gnoA
diff --git a/contract/r/gnoswap/v1/gov/staker/util.gno → contract/r/gnoswap/gov/staker/util.gno b/contract/r/gnoswap/v1/gov/staker/util.gno → contract/r/gnoswap/gov/staker/util.gno
diff --git a/...act/r/gnoswap/v1/gov/staker/util_test.gno → contract/r/gnoswap/gov/staker/util_test.gno b/...act/r/gnoswap/v1/gov/staker/util_test.gno → contract/r/gnoswap/gov/staker/util_test.gno
diff --git a/contract/r/gnoswap/v1/gov/xgns/errors.gno → contract/r/gnoswap/gov/xgns/errors.gno b/contract/r/gnoswap/v1/gov/xgns/errors.gno → contract/r/gnoswap/gov/xgns/errors.gno
diff --git a/contract/r/gnoswap/v1/gov/xgns/gno.mod → contract/r/gnoswap/gov/xgns/gno.mod b/contract/r/gnoswap/v1/gov/xgns/gno.mod → contract/r/gnoswap/gov/xgns/gno.mod
diff --git a/contract/r/gnoswap/v1/gov/xgns/xgns.gno → contract/r/gnoswap/gov/xgns/xgns.gno b/contract/r/gnoswap/v1/gov/xgns/xgns.gno → contract/r/gnoswap/gov/xgns/xgns.gno
diff --git a/contract/r/gnoswap/v1/gov/xgns/xgns_test.gno → contract/r/gnoswap/gov/xgns/xgns_test.gno b/contract/r/gnoswap/v1/gov/xgns/xgns_test.gno → contract/r/gnoswap/gov/xgns/xgns_test.gno
diff --git a/...t/r/gnoswap/v1/launchpad/_helper_test.gno → ...ract/r/gnoswap/launchpad/_helper_test.gno b/...t/r/gnoswap/v1/launchpad/_helper_test.gno → ...ract/r/gnoswap/launchpad/_helper_test.gno
diff --git a/...ct/r/gnoswap/v1/launchpad/api_deposit.gno → contract/r/gnoswap/launchpad/api_deposit.gno b/...ct/r/gnoswap/v1/launchpad/api_deposit.gno → contract/r/gnoswap/launchpad/api_deposit.gno
diff --git a/...ct/r/gnoswap/v1/launchpad/api_project.gno → contract/r/gnoswap/launchpad/api_project.gno b/...ct/r/gnoswap/v1/launchpad/api_project.gno → contract/r/gnoswap/launchpad/api_project.gno
diff --git a/...act/r/gnoswap/v1/launchpad/api_reward.gno → contract/r/gnoswap/launchpad/api_reward.gno b/...act/r/gnoswap/v1/launchpad/api_reward.gno → contract/r/gnoswap/launchpad/api_reward.gno
diff --git a/contract/r/gnoswap/v1/launchpad/consts.gno → contract/r/gnoswap/launchpad/consts.gno b/contract/r/gnoswap/v1/launchpad/consts.gno → contract/r/gnoswap/launchpad/consts.gno
diff --git a/contract/r/gnoswap/v1/launchpad/deposit.gno → contract/r/gnoswap/launchpad/deposit.gno b/contract/r/gnoswap/v1/launchpad/deposit.gno → contract/r/gnoswap/launchpad/deposit.gno
diff --git a/...t/r/gnoswap/v1/launchpad/deposit_test.gno → ...ract/r/gnoswap/launchpad/deposit_test.gno b/...t/r/gnoswap/v1/launchpad/deposit_test.gno → ...ract/r/gnoswap/launchpad/deposit_test.gno
diff --git a/contract/r/gnoswap/v1/launchpad/doc.gno → contract/r/gnoswap/launchpad/doc.gno b/contract/r/gnoswap/v1/launchpad/doc.gno → contract/r/gnoswap/launchpad/doc.gno
diff --git a/contract/r/gnoswap/v1/launchpad/errors.gno → contract/r/gnoswap/launchpad/errors.gno b/contract/r/gnoswap/v1/launchpad/errors.gno → contract/r/gnoswap/launchpad/errors.gno
diff --git a/contract/r/gnoswap/v1/launchpad/gno.mod → contract/r/gnoswap/launchpad/gno.mod b/contract/r/gnoswap/v1/launchpad/gno.mod → contract/r/gnoswap/launchpad/gno.mod
diff --git a/...t/r/gnoswap/v1/launchpad/json_builder.gno → ...ract/r/gnoswap/launchpad/json_builder.gno b/...t/r/gnoswap/v1/launchpad/json_builder.gno → ...ract/r/gnoswap/launchpad/json_builder.gno
diff --git a/...noswap/v1/launchpad/json_builder_test.gno → ...r/gnoswap/launchpad/json_builder_test.gno b/...noswap/v1/launchpad/json_builder_test.gno → ...r/gnoswap/launchpad/json_builder_test.gno
diff --git a/...ract/r/gnoswap/v1/launchpad/launchpad.gno → contract/r/gnoswap/launchpad/launchpad.gno b/...ract/r/gnoswap/v1/launchpad/launchpad.gno → contract/r/gnoswap/launchpad/launchpad.gno
diff --git a/...r/gnoswap/v1/launchpad/launchpad_test.gno → ...ct/r/gnoswap/launchpad/launchpad_test.gno b/...r/gnoswap/v1/launchpad/launchpad_test.gno → ...ct/r/gnoswap/launchpad/launchpad_test.gno
diff --git a/contract/r/gnoswap/v1/launchpad/reward.gno → contract/r/gnoswap/launchpad/reward.gno b/contract/r/gnoswap/v1/launchpad/reward.gno → contract/r/gnoswap/launchpad/reward.gno
diff --git a/...oswap/v1/launchpad/reward_calculation.gno → .../gnoswap/launchpad/reward_calculation.gno b/...oswap/v1/launchpad/reward_calculation.gno → .../gnoswap/launchpad/reward_calculation.gno
diff --git a/.../v1/launchpad/reward_calculation_test.gno → ...wap/launchpad/reward_calculation_test.gno b/.../v1/launchpad/reward_calculation_test.gno → ...wap/launchpad/reward_calculation_test.gno
diff --git a/...ct/r/gnoswap/v1/launchpad/reward_test.gno → contract/r/gnoswap/launchpad/reward_test.gno b/...ct/r/gnoswap/v1/launchpad/reward_test.gno → contract/r/gnoswap/launchpad/reward_test.gno
diff --git a/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ...ad/tests/_0_init_token_register_test.gnoA b/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ...ad/tests/_0_init_token_register_test.gnoA
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...gnoswap/launchpad/tests/_helper_test.gnoA b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...gnoswap/launchpad/tests/_helper_test.gnoA
diff --git a/...__TEST_launchpad_create_project_test.gnoA → .../tests/launchpad_create_project_test.gnoA b/...__TEST_launchpad_create_project_test.gnoA → .../tests/launchpad_create_project_test.gnoA
diff --git a/...eposit_project_single_recipient_test.gnoA → ...eposit_project_single_recipient_test.gnoA b/...eposit_project_single_recipient_test.gnoA → ...eposit_project_single_recipient_test.gnoA
diff --git a/...d_deposit_project_two_recipient_test.gnoA → ...d_deposit_project_two_recipient_test.gnoA b/...d_deposit_project_two_recipient_test.gnoA → ...d_deposit_project_two_recipient_test.gnoA
diff --git a/...refund_ended_proejct_no_deposit_test.gnoA → ...refund_ended_proejct_no_deposit_test.gnoA b/...refund_ended_proejct_no_deposit_test.gnoA → ...refund_ended_proejct_no_deposit_test.gnoA
diff --git a/...efund_ended_proejct_with_tier30_test.gnoA → ...efund_ended_proejct_with_tier30_test.gnoA b/...efund_ended_proejct_with_tier30_test.gnoA → ...efund_ended_proejct_with_tier30_test.gnoA
diff --git a/...nchpad_reward_and_gov_reward_01_test.gnoA → ...nchpad_reward_and_gov_reward_01_test.gnoA b/...nchpad_reward_and_gov_reward_01_test.gnoA → ...nchpad_reward_and_gov_reward_01_test.gnoA
diff --git a/...nchpad_reward_and_gov_reward_02_test.gnoA → ...nchpad_reward_and_gov_reward_02_test.gnoA b/...nchpad_reward_and_gov_reward_02_test.gnoA → ...nchpad_reward_and_gov_reward_02_test.gnoA
diff --git a/...nchpad_reward_and_gov_reward_03_test.gnoA → ...nchpad_reward_and_gov_reward_03_test.gnoA b/...nchpad_reward_and_gov_reward_03_test.gnoA → ...nchpad_reward_and_gov_reward_03_test.gnoA
diff --git a/...ingle_deposit_reward_by_proejct_test.gnoA → ...ingle_deposit_reward_by_proejct_test.gnoA b/...ingle_deposit_reward_by_proejct_test.gnoA → ...ingle_deposit_reward_by_proejct_test.gnoA
diff --git a/..._deposit_reward_by_proejct_tier_test.gnoA → ..._deposit_reward_by_proejct_tier_test.gnoA b/..._deposit_reward_by_proejct_tier_test.gnoA → ..._deposit_reward_by_proejct_tier_test.gnoA
diff --git a/..._deposit_01_deposit_collect_gns_test.gnoA → ..._deposit_01_deposit_collect_gns_test.gnoA b/..._deposit_01_deposit_collect_gns_test.gnoA → ..._deposit_01_deposit_collect_gns_test.gnoA
diff --git a/...it_02_deposit_reward_by_proejct_test.gnoA → ...it_02_deposit_reward_by_proejct_test.gnoA b/...it_02_deposit_reward_by_proejct_test.gnoA → ...it_02_deposit_reward_by_proejct_test.gnoA
diff --git a/...it_03_deposit_reward_by_deposit_test.gnoA → ...it_03_deposit_reward_by_deposit_test.gnoA b/...it_03_deposit_reward_by_deposit_test.gnoA → ...it_03_deposit_reward_by_deposit_test.gnoA
diff --git a/...sit_reward_by_deposit_endheight_test.gnoA → ...sit_reward_by_deposit_endheight_test.gnoA b/...sit_reward_by_deposit_endheight_test.gnoA → ...sit_reward_by_deposit_endheight_test.gnoA
diff --git a/...30_two_deposit_reward_by_project_test.gno → ...0_two_deposit_reward_by_project_test.gnoA b/...30_two_deposit_reward_by_project_test.gno → ...0_two_deposit_reward_by_project_test.gnoA
diff --git a/..._deposit_reward_by_proejct_tier_test.gnoA → ..._deposit_reward_by_proejct_tier_test.gnoA b/..._deposit_reward_by_proejct_tier_test.gnoA → ..._deposit_reward_by_proejct_tier_test.gnoA
diff --git a/..._deposit_reward_by_proejct_tier_test.gnoA → ..._deposit_reward_by_proejct_tier_test.gnoA b/..._deposit_reward_by_proejct_tier_test.gnoA → ..._deposit_reward_by_proejct_tier_test.gnoA
diff --git a/.../launchpad/tests/__TEST_RPC_api_test.gnoA → ...gnoswap/launchpad/tests/rpc_api_test.gnoA b/.../launchpad/tests/__TEST_RPC_api_test.gnoA → ...gnoswap/launchpad/tests/rpc_api_test.gnoA
diff --git a/contract/r/gnoswap/v1/launchpad/type.gno → contract/r/gnoswap/launchpad/type.gno b/contract/r/gnoswap/v1/launchpad/type.gno → contract/r/gnoswap/launchpad/type.gno
diff --git a/contract/r/gnoswap/v1/launchpad/util.gno → contract/r/gnoswap/launchpad/util.gno b/contract/r/gnoswap/v1/launchpad/util.gno → contract/r/gnoswap/launchpad/util.gno
diff --git a/contract/r/gnoswap/v1/pool/_helper_test.gno → contract/r/gnoswap/pool/_helper_test.gno b/contract/r/gnoswap/v1/pool/_helper_test.gno → contract/r/gnoswap/pool/_helper_test.gno
diff --git a/contract/r/gnoswap/v1/pool/api.gno → contract/r/gnoswap/pool/api.gno b/contract/r/gnoswap/v1/pool/api.gno → contract/r/gnoswap/pool/api.gno
diff --git a/contract/r/gnoswap/v1/pool/api_test.gno → contract/r/gnoswap/pool/api_test.gno b/contract/r/gnoswap/v1/pool/api_test.gno → contract/r/gnoswap/pool/api_test.gno
diff --git a/contract/r/gnoswap/v1/pool/doc.gno → contract/r/gnoswap/pool/doc.gno b/contract/r/gnoswap/v1/pool/doc.gno → contract/r/gnoswap/pool/doc.gno
diff --git a/contract/r/gnoswap/v1/pool/errors.gno → contract/r/gnoswap/pool/errors.gno b/contract/r/gnoswap/v1/pool/errors.gno → contract/r/gnoswap/pool/errors.gno
diff --git a/contract/r/gnoswap/v1/pool/getter.gno → contract/r/gnoswap/pool/getter.gno b/contract/r/gnoswap/v1/pool/getter.gno → contract/r/gnoswap/pool/getter.gno
diff --git a/contract/r/gnoswap/v1/pool/getter_test.gno → contract/r/gnoswap/pool/getter_test.gno b/contract/r/gnoswap/v1/pool/getter_test.gno → contract/r/gnoswap/pool/getter_test.gno
diff --git a/contract/r/gnoswap/v1/pool/gno.mod → contract/r/gnoswap/pool/gno.mod b/contract/r/gnoswap/v1/pool/gno.mod → contract/r/gnoswap/pool/gno.mod
diff --git a/...ract/r/gnoswap/v1/pool/liquidity_math.gno → contract/r/gnoswap/pool/liquidity_math.gno b/...ract/r/gnoswap/v1/pool/liquidity_math.gno → contract/r/gnoswap/pool/liquidity_math.gno
diff --git a/...r/gnoswap/v1/pool/liquidity_math_test.gno → ...ct/r/gnoswap/pool/liquidity_math_test.gno b/...r/gnoswap/v1/pool/liquidity_math_test.gno → ...ct/r/gnoswap/pool/liquidity_math_test.gno
diff --git a/contract/r/gnoswap/v1/pool/pool.gno → contract/r/gnoswap/pool/pool.gno b/contract/r/gnoswap/v1/pool/pool.gno → contract/r/gnoswap/pool/pool.gno
diff --git a/contract/r/gnoswap/v1/pool/pool_manager.gno → contract/r/gnoswap/pool/pool_manager.gno b/contract/r/gnoswap/v1/pool/pool_manager.gno → contract/r/gnoswap/pool/pool_manager.gno
diff --git a/...t/r/gnoswap/v1/pool/pool_manager_test.gno → ...ract/r/gnoswap/pool/pool_manager_test.gno b/...t/r/gnoswap/v1/pool/pool_manager_test.gno → ...ract/r/gnoswap/pool/pool_manager_test.gno
diff --git a/contract/r/gnoswap/v1/pool/pool_test.gno → contract/r/gnoswap/pool/pool_test.gno b/contract/r/gnoswap/v1/pool/pool_test.gno → contract/r/gnoswap/pool/pool_test.gno
diff --git a/contract/r/gnoswap/v1/pool/pool_transfer.gno → contract/r/gnoswap/pool/pool_transfer.gno b/contract/r/gnoswap/v1/pool/pool_transfer.gno → contract/r/gnoswap/pool/pool_transfer.gno
diff --git a/.../r/gnoswap/v1/pool/pool_transfer_test.gno → ...act/r/gnoswap/pool/pool_transfer_test.gno b/.../r/gnoswap/v1/pool/pool_transfer_test.gno → ...act/r/gnoswap/pool/pool_transfer_test.gno
diff --git a/contract/r/gnoswap/v1/pool/position.gno → contract/r/gnoswap/pool/position.gno b/contract/r/gnoswap/v1/pool/position.gno → contract/r/gnoswap/pool/position.gno
diff --git a/...act/r/gnoswap/v1/pool/position_modify.gno → contract/r/gnoswap/pool/position_modify.gno b/...act/r/gnoswap/v1/pool/position_modify.gno → contract/r/gnoswap/pool/position_modify.gno
@@ -2,8 +2,8 @@ package pool
 
 import (
 	"gno.land/p/demo/ufmt"
+	plp "gno.land/p/gnoswap/gnsmath"
 	i256 "gno.land/p/gnoswap/int256"
-	plp "gno.land/p/gnoswap/pool"
 	u256 "gno.land/p/gnoswap/uint256"
 	"gno.land/r/gnoswap/v1/common"
 	"gno.land/r/gnoswap/v1/consts"

diff --git a/.../gnoswap/v1/pool/position_modify_test.gno → ...t/r/gnoswap/pool/position_modify_test.gno b/.../gnoswap/v1/pool/position_modify_test.gno → ...t/r/gnoswap/pool/position_modify_test.gno
diff --git a/contract/r/gnoswap/v1/pool/position_test.gno → contract/r/gnoswap/pool/position_test.gno b/contract/r/gnoswap/v1/pool/position_test.gno → contract/r/gnoswap/pool/position_test.gno
diff --git a/...act/r/gnoswap/v1/pool/position_update.gno → contract/r/gnoswap/pool/position_update.gno b/...act/r/gnoswap/v1/pool/position_update.gno → contract/r/gnoswap/pool/position_update.gno
diff --git a/.../gnoswap/v1/pool/position_update_test.gno → ...t/r/gnoswap/pool/position_update_test.gno b/.../gnoswap/v1/pool/position_update_test.gno → ...t/r/gnoswap/pool/position_update_test.gno
diff --git a/...ap/v1/pool/protocol_fee_pool_creation.gno → ...oswap/pool/protocol_fee_pool_creation.gno b/...ap/v1/pool/protocol_fee_pool_creation.gno → ...oswap/pool/protocol_fee_pool_creation.gno
diff --git a/.../pool/protocol_fee_pool_creation_test.gno → .../pool/protocol_fee_pool_creation_test.gno b/.../pool/protocol_fee_pool_creation_test.gno → .../pool/protocol_fee_pool_creation_test.gno
diff --git a/...oswap/v1/pool/protocol_fee_withdrawal.gno → .../gnoswap/pool/protocol_fee_withdrawal.gno b/...oswap/v1/pool/protocol_fee_withdrawal.gno → .../gnoswap/pool/protocol_fee_withdrawal.gno
diff --git a/.../v1/pool/protocol_fee_withdrawal_test.gno → ...wap/pool/protocol_fee_withdrawal_test.gno b/.../v1/pool/protocol_fee_withdrawal_test.gno → ...wap/pool/protocol_fee_withdrawal_test.gno
diff --git a/contract/r/gnoswap/v1/pool/swap.gno → contract/r/gnoswap/pool/swap.gno b/contract/r/gnoswap/v1/pool/swap.gno → contract/r/gnoswap/pool/swap.gno
@@ -7,8 +7,8 @@ import (
 	"gno.land/r/gnoswap/v1/common"
 	"gno.land/r/gnoswap/v1/consts"
 
+	plp "gno.land/p/gnoswap/gnsmath"
 	i256 "gno.land/p/gnoswap/int256"
-	plp "gno.land/p/gnoswap/pool" // pool package
 	u256 "gno.land/p/gnoswap/uint256"
 )
 

diff --git a/contract/r/gnoswap/v1/pool/swap_test.gno → contract/r/gnoswap/pool/swap_test.gno b/contract/r/gnoswap/v1/pool/swap_test.gno → contract/r/gnoswap/pool/swap_test.gno
diff --git a/.../v1/pool/tests/__TEST_pool_burn_test.gnoA → .../r/gnoswap/pool/tests/pool_burn_test.gnoA b/.../v1/pool/tests/__TEST_pool_burn_test.gnoA → .../r/gnoswap/pool/tests/pool_burn_test.gnoA
diff --git a/...l/tests/__TEST_pool_create_pool_test.gnoA → ...wap/pool/tests/pool_create_pool_test.gnoA b/...l/tests/__TEST_pool_create_pool_test.gnoA → ...wap/pool/tests/pool_create_pool_test.gnoA
diff --git a/...ts/__TEST_pool_dryswap_and_swap_test.gnoA → ...ool/tests/pool_dryswap_and_swap_test.gnoA b/...ts/__TEST_pool_dryswap_and_swap_test.gnoA → ...ool/tests/pool_dryswap_and_swap_test.gnoA
diff --git a/.../tests/__TEST_pool_fee_protocol_test.gnoA → ...ap/pool/tests/pool_fee_protocol_test.gnoA b/.../tests/__TEST_pool_fee_protocol_test.gnoA → ...ap/pool/tests/pool_fee_protocol_test.gnoA
diff --git a/.../v1/pool/tests/__TEST_pool_init_test.gnoA → .../r/gnoswap/pool/tests/pool_init_test.gnoA b/.../v1/pool/tests/__TEST_pool_init_test.gnoA → .../r/gnoswap/pool/tests/pool_init_test.gnoA
diff --git a/...v1/pool/tests/__TEST_pool_limit_test.gnoA → ...r/gnoswap/pool/tests/pool_limit_test.gnoA b/...v1/pool/tests/__TEST_pool_limit_test.gnoA → ...r/gnoswap/pool/tests/pool_limit_test.gnoA
diff --git a/...ST_pool_limit_with_protocol_fee_test.gnoA → ...ts/pool_limit_with_protocol_fee_test.gnoA b/...ST_pool_limit_with_protocol_fee_test.gnoA → ...ts/pool_limit_with_protocol_fee_test.gnoA
diff --git a/.../v1/pool/tests/__TEST_pool_mint_test.gnoA → .../r/gnoswap/pool/tests/pool_mint_test.gnoA b/.../v1/pool/tests/__TEST_pool_mint_test.gnoA → .../r/gnoswap/pool/tests/pool_mint_test.gnoA
diff --git a/...l/tests/__TEST_pool_multi_token_test.gnoA → ...wap/pool/tests/pool_multi_token_test.gnoA b/...l/tests/__TEST_pool_multi_token_test.gnoA → ...wap/pool/tests/pool_multi_token_test.gnoA
diff --git a/...l/tests/__TEST_pool_native_swap_test.gnoA → ...wap/pool/tests/pool_native_swap_test.gnoA b/...l/tests/__TEST_pool_native_swap_test.gnoA → ...wap/pool/tests/pool_native_swap_test.gnoA
diff --git a/...ool/tests/__TEST_pool_single_lp_test.gnoA → ...oswap/pool/tests/pool_single_lp_test.gnoA b/...ool/tests/__TEST_pool_single_lp_test.gnoA → ...oswap/pool/tests/pool_single_lp_test.gnoA
diff --git a/.../pool/tests/__TEST_pool_spec_#1_test.gnoA → ...gnoswap/pool/tests/pool_spec_#1_test.gnoA b/.../pool/tests/__TEST_pool_spec_#1_test.gnoA → ...gnoswap/pool/tests/pool_spec_#1_test.gnoA
diff --git a/.../pool/tests/__TEST_pool_spec_#2_test.gnoA → ...gnoswap/pool/tests/pool_spec_#2_test.gnoA b/.../pool/tests/__TEST_pool_spec_#2_test.gnoA → ...gnoswap/pool/tests/pool_spec_#2_test.gnoA
diff --git a/.../pool/tests/__TEST_pool_spec_#3_test.gnoA → ...gnoswap/pool/tests/pool_spec_#3_test.gnoA b/.../pool/tests/__TEST_pool_spec_#3_test.gnoA → ...gnoswap/pool/tests/pool_spec_#3_test.gnoA
diff --git a/.../pool/tests/__TEST_pool_spec_#4_test.gnoA → ...gnoswap/pool/tests/pool_spec_#4_test.gnoA b/.../pool/tests/__TEST_pool_spec_#4_test.gnoA → ...gnoswap/pool/tests/pool_spec_#4_test.gnoA
diff --git a/.../pool/tests/__TEST_pool_spec_#5_test.gnoA → ...gnoswap/pool/tests/pool_spec_#5_test.gnoA b/.../pool/tests/__TEST_pool_spec_#5_test.gnoA → ...gnoswap/pool/tests/pool_spec_#5_test.gnoA
diff --git a/.../pool/tests/__TEST_pool_spec_#6_test.gnoA → ...gnoswap/pool/tests/pool_spec_#6_test.gnoA b/.../pool/tests/__TEST_pool_spec_#6_test.gnoA → ...gnoswap/pool/tests/pool_spec_#6_test.gnoA
diff --git a/...oswap/v1/pool/tests/__TEST_pool_test.gnoA → contract/r/gnoswap/pool/tests/pool_test.gnoA b/...oswap/v1/pool/tests/__TEST_pool_test.gnoA → contract/r/gnoswap/pool/tests/pool_test.gnoA
diff --git a/.../v1/pool/tests/__TEST_pool_tick_test.gnoA → .../r/gnoswap/pool/tests/pool_tick_test.gnoA b/.../v1/pool/tests/__TEST_pool_tick_test.gnoA → .../r/gnoswap/pool/tests/pool_tick_test.gnoA
diff --git a/...ts/__TEST_pool_tick_transaction_test.gnoA → ...ool/tests/pool_tick_transaction_test.gnoA b/...ts/__TEST_pool_tick_transaction_test.gnoA → ...ool/tests/pool_tick_transaction_test.gnoA
@@ -8,7 +8,7 @@ import (
 	i256 "gno.land/p/gnoswap/int256"
 	u256 "gno.land/p/gnoswap/uint256"
 
-	plp "gno.land/p/gnoswap/pool"
+	plp "gno.land/p/gnoswap/gnsmath"
 
 	"gno.land/r/gnoswap/v1/common"
 	"gno.land/r/gnoswap/v1/consts"

diff --git a/...1/pool/tests/__TEST_tick_bitmap_test.gnoA → .../gnoswap/pool/tests/tick_bitmap_test.gnoA b/...1/pool/tests/__TEST_tick_bitmap_test.gnoA → .../gnoswap/pool/tests/tick_bitmap_test.gnoA
@@ -8,7 +8,7 @@ import (
 
 	u256 "gno.land/p/gnoswap/uint256"
 
-	plp "gno.land/p/gnoswap/pool"
+	plp "gno.land/p/gnoswap/gnsmath"
 
 	"gno.land/r/gnoswap/v1/consts"
 )

diff --git a/contract/r/gnoswap/v1/pool/tick.gno → contract/r/gnoswap/pool/tick.gno b/contract/r/gnoswap/v1/pool/tick.gno → contract/r/gnoswap/pool/tick.gno
diff --git a/contract/r/gnoswap/v1/pool/tick_bitmap.gno → contract/r/gnoswap/pool/tick_bitmap.gno b/contract/r/gnoswap/v1/pool/tick_bitmap.gno → contract/r/gnoswap/pool/tick_bitmap.gno
@@ -4,7 +4,7 @@ import (
 	"strconv"
 
 	"gno.land/p/demo/ufmt"
-	plp "gno.land/p/gnoswap/pool"
+	plp "gno.land/p/gnoswap/gnsmath"
 
 	u256 "gno.land/p/gnoswap/uint256"
 )

diff --git a/...ct/r/gnoswap/v1/pool/tick_bitmap_test.gno → contract/r/gnoswap/pool/tick_bitmap_test.gno b/...ct/r/gnoswap/v1/pool/tick_bitmap_test.gno → contract/r/gnoswap/pool/tick_bitmap_test.gno
diff --git a/contract/r/gnoswap/v1/pool/tick_test.gno → contract/r/gnoswap/pool/tick_test.gno b/contract/r/gnoswap/v1/pool/tick_test.gno → contract/r/gnoswap/pool/tick_test.gno
diff --git a/contract/r/gnoswap/v1/pool/type.gno → contract/r/gnoswap/pool/type.gno b/contract/r/gnoswap/v1/pool/type.gno → contract/r/gnoswap/pool/type.gno
diff --git a/contract/r/gnoswap/v1/pool/utils.gno → contract/r/gnoswap/pool/utils.gno b/contract/r/gnoswap/v1/pool/utils.gno → contract/r/gnoswap/pool/utils.gno
diff --git a/contract/r/gnoswap/v1/pool/utils_test.gno → contract/r/gnoswap/pool/utils_test.gno b/contract/r/gnoswap/v1/pool/utils_test.gno → contract/r/gnoswap/pool/utils_test.gno
diff --git a/...ct/r/gnoswap/v1/position/_helper_test.gno → contract/r/gnoswap/position/_helper_test.gno b/...ct/r/gnoswap/v1/position/_helper_test.gno → contract/r/gnoswap/position/_helper_test.gno
diff --git a/contract/r/gnoswap/v1/position/api.gno → contract/r/gnoswap/position/api.gno b/contract/r/gnoswap/v1/position/api.gno → contract/r/gnoswap/position/api.gno
diff --git a/contract/r/gnoswap/v1/position/api_test.gno → contract/r/gnoswap/position/api_test.gno b/contract/r/gnoswap/v1/position/api_test.gno → contract/r/gnoswap/position/api_test.gno
diff --git a/contract/r/gnoswap/v1/position/doc.gno → contract/r/gnoswap/position/doc.gno b/contract/r/gnoswap/v1/position/doc.gno → contract/r/gnoswap/position/doc.gno
diff --git a/contract/r/gnoswap/v1/position/errors.gno → contract/r/gnoswap/position/errors.gno b/contract/r/gnoswap/v1/position/errors.gno → contract/r/gnoswap/position/errors.gno
diff --git a/contract/r/gnoswap/v1/position/getter.gno → contract/r/gnoswap/position/getter.gno b/contract/r/gnoswap/v1/position/getter.gno → contract/r/gnoswap/position/getter.gno
diff --git a/...act/r/gnoswap/v1/position/getter_test.gno → contract/r/gnoswap/position/getter_test.gno b/...act/r/gnoswap/v1/position/getter_test.gno → contract/r/gnoswap/position/getter_test.gno
diff --git a/contract/r/gnoswap/v1/position/gno.mod → contract/r/gnoswap/position/gno.mod b/contract/r/gnoswap/v1/position/gno.mod → contract/r/gnoswap/position/gno.mod
diff --git a/...swap/v1/position/liquidity_management.gno → ...gnoswap/position/liquidity_management.gno b/...swap/v1/position/liquidity_management.gno → ...gnoswap/position/liquidity_management.gno
diff --git a/...v1/position/liquidity_management_test.gno → ...ap/position/liquidity_management_test.gno b/...v1/position/liquidity_management_test.gno → ...ap/position/liquidity_management_test.gno
diff --git a/...ct/r/gnoswap/v1/position/native_token.gno → contract/r/gnoswap/position/native_token.gno b/...ct/r/gnoswap/v1/position/native_token.gno → contract/r/gnoswap/position/native_token.gno
diff --git a/...gnoswap/v1/position/native_token_test.gno → .../r/gnoswap/position/native_token_test.gno b/...gnoswap/v1/position/native_token_test.gno → .../r/gnoswap/position/native_token_test.gno
diff --git a/contract/r/gnoswap/v1/position/position.gno → contract/r/gnoswap/position/position.gno b/contract/r/gnoswap/v1/position/position.gno → contract/r/gnoswap/position/position.gno
diff --git a/...t/r/gnoswap/v1/position/position_test.gno → ...ract/r/gnoswap/position/position_test.gno b/...t/r/gnoswap/v1/position/position_test.gno → ...ract/r/gnoswap/position/position_test.gno
diff --git a/..._TEST_fee_collect_with_two_user_test.gnoA → ...tests/fee_collect_with_two_user_test.gnoA b/..._TEST_fee_collect_with_two_user_test.gnoA → ...tests/fee_collect_with_two_user_test.gnoA
diff --git a/...ition/tests/__TEST_position_api_test.gnoA → ...wap/position/tests/position_api_test.gnoA b/...ition/tests/__TEST_position_api_test.gnoA → ...wap/position/tests/position_api_test.gnoA
diff --git a/...tion/tests/__TEST_position_full_test.gnoA → ...ap/position/tests/position_full_test.gnoA b/...tion/tests/__TEST_position_full_test.gnoA → ...ap/position/tests/position_full_test.gnoA
diff --git a/...EST_position_full_with_emission_test.gnoA → ...sts/position_full_with_emission_test.gnoA b/...EST_position_full_with_emission_test.gnoA → ...sts/position_full_with_emission_test.gnoA
diff --git a/...sition_increase_burned_position_test.gnoA → ...sition_increase_burned_position_test.gnoA b/...sition_increase_burned_position_test.gnoA → ...sition_increase_burned_position_test.gnoA
diff --git a/...TEST_position_increase_decrease_test.gnoA → ...ests/position_increase_decrease_test.gnoA b/...TEST_position_increase_decrease_test.gnoA → ...ests/position_increase_decrease_test.gnoA
diff --git a/...t_gnot_grc20_in-range_out-range_test.gnoA → ...t_gnot_grc20_in-range_out-range_test.gnoA b/...t_gnot_grc20_in-range_out-range_test.gnoA → ...t_gnot_grc20_in-range_out-range_test.gnoA
diff --git a/...ST_position_mint_swap_burn_left_test.gnoA → ...ts/position_mint_swap_burn_left_test.gnoA b/...ST_position_mint_swap_burn_left_test.gnoA → ...ts/position_mint_swap_burn_left_test.gnoA
diff --git a/...sition_native_increase_decrease_test.gnoA → ...sition_native_increase_decrease_test.gnoA b/...sition_native_increase_decrease_test.gnoA → ...sition_native_increase_decrease_test.gnoA
diff --git a/..._position_native_mint_swap_burn_test.gnoA → .../position_native_mint_swap_burn_test.gnoA b/..._position_native_mint_swap_burn_test.gnoA → .../position_native_mint_swap_burn_test.gnoA
diff --git a/...T_position_reposition_gnot_pair_test.gnoA → ...s/position_reposition_gnot_pair_test.gnoA b/...T_position_reposition_gnot_pair_test.gnoA → ...s/position_reposition_gnot_pair_test.gnoA
diff --git a/..._position_reposition_grc20_pair_test.gnoA → .../position_reposition_grc20_pair_test.gnoA b/..._position_reposition_grc20_pair_test.gnoA → .../position_reposition_grc20_pair_test.gnoA
diff --git a/...reposition_grc20_pair_with_swap_test.gnoA → ...reposition_grc20_pair_with_swap_test.gnoA b/...reposition_grc20_pair_with_swap_test.gnoA → ...reposition_grc20_pair_with_swap_test.gnoA
diff --git a/...ff_range_diff_position_swap_fee_test.gnoA → ...ff_range_diff_position_swap_fee_test.gnoA b/...ff_range_diff_position_swap_fee_test.gnoA → ...ff_range_diff_position_swap_fee_test.gnoA
diff --git a/...me_range_diff_position_swap_fee_test.gnoA → ...me_range_diff_position_swap_fee_test.gnoA b/...me_range_diff_position_swap_fee_test.gnoA → ...me_range_diff_position_swap_fee_test.gnoA
diff --git a/...t_two_position_used_single_swap_test.gnoA → ...t_two_position_used_single_swap_test.gnoA b/...t_two_position_used_single_swap_test.gnoA → ...t_two_position_used_single_swap_test.gnoA
diff --git a/...wed_left_grc20_pair_more_action_test.gnoA → ...wed_left_grc20_pair_more_action_test.gnoA b/...wed_left_grc20_pair_more_action_test.gnoA → ...wed_left_grc20_pair_more_action_test.gnoA
diff --git a/...wed_left_pair_more_action_exact_test.gnoA → ...wed_left_pair_more_action_exact_test.gnoA b/...wed_left_pair_more_action_exact_test.gnoA → ...wed_left_pair_more_action_exact_test.gnoA
diff --git a/...s/__TEST_position_unclaimed_fee_test.gnoA → ...on/tests/position_unclaimed_fee_test.gnoA b/...s/__TEST_position_unclaimed_fee_test.gnoA → ...on/tests/position_unclaimed_fee_test.gnoA
diff --git a/contract/r/gnoswap/v1/position/type.gno → contract/r/gnoswap/position/type.gno b/contract/r/gnoswap/v1/position/type.gno → contract/r/gnoswap/position/type.gno
diff --git a/contract/r/gnoswap/v1/position/utils.gno → contract/r/gnoswap/position/utils.gno b/contract/r/gnoswap/v1/position/utils.gno → contract/r/gnoswap/position/utils.gno
diff --git a/...ract/r/gnoswap/v1/position/utils_test.gno → contract/r/gnoswap/position/utils_test.gno b/...ract/r/gnoswap/v1/position/utils_test.gno → contract/r/gnoswap/position/utils_test.gno
diff --git a/...ract/r/gnoswap/v1/protocol_fee/errors.gno → contract/r/gnoswap/protocol_fee/errors.gno b/...ract/r/gnoswap/v1/protocol_fee/errors.gno → contract/r/gnoswap/protocol_fee/errors.gno
diff --git a/contract/r/gnoswap/v1/protocol_fee/gno.mod → contract/r/gnoswap/protocol_fee/gno.mod b/contract/r/gnoswap/v1/protocol_fee/gno.mod → contract/r/gnoswap/protocol_fee/gno.mod
diff --git a/.../gnoswap/v1/protocol_fee/protocol_fee.gno → ...t/r/gnoswap/protocol_fee/protocol_fee.gno b/.../gnoswap/v1/protocol_fee/protocol_fee.gno → ...t/r/gnoswap/protocol_fee/protocol_fee.gno
diff --git a/...wap/v1/protocol_fee/protocol_fee_test.gno → ...noswap/protocol_fee/protocol_fee_test.gno b/...wap/v1/protocol_fee/protocol_fee_test.gno → ...noswap/protocol_fee/protocol_fee_test.gno
diff --git a/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ..._fee/tests/0_init_token_register_test.gno b/...sts/__TEST_0_INIT_TOKEN_REGISTER_test.gno → ..._fee/tests/0_init_token_register_test.gno
diff --git a/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...oswap/protocol_fee/tests/_helper_test.gno b/..._TEST_0_INIT_VARIABLE_AND_HELPER_test.gno → ...oswap/protocol_fee/tests/_helper_test.gno
diff --git a/...1/protocol_fee/token_list_with_amount.gno → ...p/protocol_fee/token_list_with_amount.gno b/...1/protocol_fee/token_list_with_amount.gno → ...p/protocol_fee/token_list_with_amount.gno
diff --git a/...tocol_fee/token_list_with_amount_test.gno → ...tocol_fee/token_list_with_amount_test.gno b/...tocol_fee/token_list_with_amount_test.gno → ...tocol_fee/token_list_with_amount_test.gno
diff --git a/contract/r/gnoswap/v1/protocol_fee/utils.gno → contract/r/gnoswap/protocol_fee/utils.gno b/contract/r/gnoswap/v1/protocol_fee/utils.gno → contract/r/gnoswap/protocol_fee/utils.gno
diff --git a/contract/r/gnoswap/v1/referral/doc.gno → contract/r/gnoswap/referral/doc.gno b/contract/r/gnoswap/v1/referral/doc.gno → contract/r/gnoswap/referral/doc.gno
diff --git a/contract/r/gnoswap/v1/referral/errors.gno → contract/r/gnoswap/referral/errors.gno b/contract/r/gnoswap/v1/referral/errors.gno → contract/r/gnoswap/referral/errors.gno
diff --git a/...t/r/gnoswap/v1/referral/global_keeper.gno → ...ract/r/gnoswap/referral/global_keeper.gno b/...t/r/gnoswap/v1/referral/global_keeper.gno → ...ract/r/gnoswap/referral/global_keeper.gno
diff --git a/contract/r/gnoswap/v1/referral/gno.mod → contract/r/gnoswap/referral/gno.mod b/contract/r/gnoswap/v1/referral/gno.mod → contract/r/gnoswap/referral/gno.mod
diff --git a/contract/r/gnoswap/v1/referral/keeper.gno → contract/r/gnoswap/referral/keeper.gno b/contract/r/gnoswap/v1/referral/keeper.gno → contract/r/gnoswap/referral/keeper.gno
diff --git a/...act/r/gnoswap/v1/referral/keeper_test.gno → contract/r/gnoswap/referral/keeper_test.gno b/...act/r/gnoswap/v1/referral/keeper_test.gno → contract/r/gnoswap/referral/keeper_test.gno
diff --git a/contract/r/gnoswap/v1/referral/referral.gno → contract/r/gnoswap/referral/referral.gno b/contract/r/gnoswap/v1/referral/referral.gno → contract/r/gnoswap/referral/referral.gno
diff --git a/contract/r/gnoswap/v1/referral/type.gno → contract/r/gnoswap/referral/type.gno b/contract/r/gnoswap/v1/referral/type.gno → contract/r/gnoswap/referral/type.gno
diff --git a/contract/r/gnoswap/v1/referral/utils.gno → contract/r/gnoswap/referral/utils.gno b/contract/r/gnoswap/v1/referral/utils.gno → contract/r/gnoswap/referral/utils.gno
diff --git a/...ract/r/gnoswap/v1/router/_helper_test.gno → contract/r/gnoswap/router/_helper_test.gno b/...ract/r/gnoswap/v1/router/_helper_test.gno → contract/r/gnoswap/router/_helper_test.gno
diff --git a/contract/r/gnoswap/v1/router/base.gno → contract/r/gnoswap/router/base.gno b/contract/r/gnoswap/v1/router/base.gno → contract/r/gnoswap/router/base.gno
diff --git a/contract/r/gnoswap/v1/router/base_test.gno → contract/r/gnoswap/router/base_test.gno b/contract/r/gnoswap/v1/router/base_test.gno → contract/r/gnoswap/router/base_test.gno
diff --git a/contract/r/gnoswap/v1/router/doc.gno → contract/r/gnoswap/router/doc.gno b/contract/r/gnoswap/v1/router/doc.gno → contract/r/gnoswap/router/doc.gno
diff --git a/contract/r/gnoswap/v1/router/errors.gno → contract/r/gnoswap/router/errors.gno b/contract/r/gnoswap/v1/router/errors.gno → contract/r/gnoswap/router/errors.gno
diff --git a/contract/r/gnoswap/v1/router/exact_in.gno → contract/r/gnoswap/router/exact_in.gno b/contract/r/gnoswap/v1/router/exact_in.gno → contract/r/gnoswap/router/exact_in.gno
diff --git a/...act/r/gnoswap/v1/router/exact_in_test.gno → contract/r/gnoswap/router/exact_in_test.gno b/...act/r/gnoswap/v1/router/exact_in_test.gno → contract/r/gnoswap/router/exact_in_test.gno
diff --git a/contract/r/gnoswap/v1/router/exact_out.gno → contract/r/gnoswap/router/exact_out.gno b/contract/r/gnoswap/v1/router/exact_out.gno → contract/r/gnoswap/router/exact_out.gno
diff --git a/contract/r/gnoswap/v1/router/gno.mod → contract/r/gnoswap/router/gno.mod b/contract/r/gnoswap/v1/router/gno.mod → contract/r/gnoswap/router/gno.mod
diff --git a/...r/gnoswap/v1/router/protocol_fee_swap.gno → ...ct/r/gnoswap/router/protocol_fee_swap.gno b/...r/gnoswap/v1/router/protocol_fee_swap.gno → ...ct/r/gnoswap/router/protocol_fee_swap.gno
diff --git a/...swap/v1/router/protocol_fee_swap_test.gno → ...gnoswap/router/protocol_fee_swap_test.gno b/...swap/v1/router/protocol_fee_swap_test.gno → ...gnoswap/router/protocol_fee_swap_test.gno
diff --git a/contract/r/gnoswap/v1/router/router.gno → contract/r/gnoswap/router/router.gno b/contract/r/gnoswap/v1/router/router.gno → contract/r/gnoswap/router/router.gno
diff --git a/contract/r/gnoswap/v1/router/router_dry.gno → contract/r/gnoswap/router/router_dry.gno b/contract/r/gnoswap/v1/router/router_dry.gno → contract/r/gnoswap/router/router_dry.gno
diff --git a/...t/r/gnoswap/v1/router/router_dry_test.gno → ...ract/r/gnoswap/router/router_dry_test.gno b/...t/r/gnoswap/v1/router/router_dry_test.gno → ...ract/r/gnoswap/router/router_dry_test.gno
diff --git a/contract/r/gnoswap/v1/router/router_test.gno → contract/r/gnoswap/router/router_test.gno b/contract/r/gnoswap/v1/router/router_test.gno → contract/r/gnoswap/router/router_test.gno
diff --git a/contract/r/gnoswap/v1/router/swap_inner.gno → contract/r/gnoswap/router/swap_inner.gno b/contract/r/gnoswap/v1/router/swap_inner.gno → contract/r/gnoswap/router/swap_inner.gno
diff --git a/...t/r/gnoswap/v1/router/swap_inner_test.gno → ...ract/r/gnoswap/router/swap_inner_test.gno b/...t/r/gnoswap/v1/router/swap_inner_test.gno → ...ract/r/gnoswap/router/swap_inner_test.gno