diff --git a/_deploy/p/gnoswap/int256/LICENSE b/contract/p/gnoswap/int256/LICENSE
similarity index 100%
rename from _deploy/p/gnoswap/int256/LICENSE
rename to contract/p/gnoswap/int256/LICENSE
diff --git a/_deploy/p/gnoswap/int256/README.md b/contract/p/gnoswap/int256/README.md
similarity index 100%
rename from _deploy/p/gnoswap/int256/README.md
rename to contract/p/gnoswap/int256/README.md
diff --git a/_deploy/p/gnoswap/int256/absolute.gno b/contract/p/gnoswap/int256/absolute.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/absolute.gno
rename to contract/p/gnoswap/int256/absolute.gno
diff --git a/_deploy/p/gnoswap/int256/absolute_test.gno b/contract/p/gnoswap/int256/absolute_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/absolute_test.gno
rename to contract/p/gnoswap/int256/absolute_test.gno
diff --git a/_deploy/p/gnoswap/int256/arithmetic.gno b/contract/p/gnoswap/int256/arithmetic.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/arithmetic.gno
rename to contract/p/gnoswap/int256/arithmetic.gno
diff --git a/_deploy/p/gnoswap/int256/arithmetic_test.gno b/contract/p/gnoswap/int256/arithmetic_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/arithmetic_test.gno
rename to contract/p/gnoswap/int256/arithmetic_test.gno
diff --git a/_deploy/p/gnoswap/int256/bitwise.gno b/contract/p/gnoswap/int256/bitwise.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/bitwise.gno
rename to contract/p/gnoswap/int256/bitwise.gno
diff --git a/_deploy/p/gnoswap/int256/bitwise_test.gno b/contract/p/gnoswap/int256/bitwise_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/bitwise_test.gno
rename to contract/p/gnoswap/int256/bitwise_test.gno
diff --git a/_deploy/p/gnoswap/int256/cmp.gno b/contract/p/gnoswap/int256/cmp.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/cmp.gno
rename to contract/p/gnoswap/int256/cmp.gno
diff --git a/_deploy/p/gnoswap/int256/cmp_test.gno b/contract/p/gnoswap/int256/cmp_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/cmp_test.gno
rename to contract/p/gnoswap/int256/cmp_test.gno
diff --git a/_deploy/p/gnoswap/int256/conversion.gno b/contract/p/gnoswap/int256/conversion.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/conversion.gno
rename to contract/p/gnoswap/int256/conversion.gno
diff --git a/_deploy/p/gnoswap/int256/conversion_test.gno b/contract/p/gnoswap/int256/conversion_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/conversion_test.gno
rename to contract/p/gnoswap/int256/conversion_test.gno
diff --git a/_deploy/p/gnoswap/int256/gno.mod b/contract/p/gnoswap/int256/gno.mod
similarity index 100%
rename from _deploy/p/gnoswap/int256/gno.mod
rename to contract/p/gnoswap/int256/gno.mod
diff --git a/_deploy/p/gnoswap/int256/int256.gno b/contract/p/gnoswap/int256/int256.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/int256.gno
rename to contract/p/gnoswap/int256/int256.gno
diff --git a/_deploy/p/gnoswap/int256/int256_test.gno b/contract/p/gnoswap/int256/int256_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/int256/int256_test.gno
rename to contract/p/gnoswap/int256/int256_test.gno
diff --git a/_deploy/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
rename to contract/p/gnoswap/pool/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
diff --git a/_deploy/p/gnoswap/pool/__TEST_bit_math_test.gnoA b/contract/p/gnoswap/pool/__TEST_bit_math_test.gnoA
similarity index 100%
rename from _deploy/p/gnoswap/pool/__TEST_bit_math_test.gnoA
rename to contract/p/gnoswap/pool/__TEST_bit_math_test.gnoA
diff --git a/_deploy/p/gnoswap/pool/bit_math.gno b/contract/p/gnoswap/pool/bit_math.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/bit_math.gno
rename to contract/p/gnoswap/pool/bit_math.gno
diff --git a/_deploy/p/gnoswap/pool/consts.gno b/contract/p/gnoswap/pool/consts.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/consts.gno
rename to contract/p/gnoswap/pool/consts.gno
diff --git a/_deploy/p/gnoswap/pool/gno.mod b/contract/p/gnoswap/pool/gno.mod
similarity index 100%
rename from _deploy/p/gnoswap/pool/gno.mod
rename to contract/p/gnoswap/pool/gno.mod
diff --git a/_deploy/p/gnoswap/pool/sqrt_price_math.gno b/contract/p/gnoswap/pool/sqrt_price_math.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/sqrt_price_math.gno
rename to contract/p/gnoswap/pool/sqrt_price_math.gno
diff --git a/_deploy/p/gnoswap/pool/sqrt_price_math_test.gno b/contract/p/gnoswap/pool/sqrt_price_math_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/sqrt_price_math_test.gno
rename to contract/p/gnoswap/pool/sqrt_price_math_test.gno
diff --git a/_deploy/p/gnoswap/pool/swap_math.gno b/contract/p/gnoswap/pool/swap_math.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/swap_math.gno
rename to contract/p/gnoswap/pool/swap_math.gno
diff --git a/_deploy/p/gnoswap/pool/swap_math_test.gno b/contract/p/gnoswap/pool/swap_math_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/pool/swap_math_test.gno
rename to contract/p/gnoswap/pool/swap_math_test.gno
diff --git a/_deploy/p/gnoswap/uint256/LICENSE b/contract/p/gnoswap/uint256/LICENSE
similarity index 100%
rename from _deploy/p/gnoswap/uint256/LICENSE
rename to contract/p/gnoswap/uint256/LICENSE
diff --git a/_deploy/p/gnoswap/uint256/README.md b/contract/p/gnoswap/uint256/README.md
similarity index 100%
rename from _deploy/p/gnoswap/uint256/README.md
rename to contract/p/gnoswap/uint256/README.md
diff --git a/_deploy/p/gnoswap/uint256/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/p/gnoswap/uint256/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
rename to contract/p/gnoswap/uint256/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
diff --git a/_deploy/p/gnoswap/uint256/__TEST_u256_test.gno b/contract/p/gnoswap/uint256/__TEST_u256_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/__TEST_u256_test.gno
rename to contract/p/gnoswap/uint256/__TEST_u256_test.gno
diff --git a/_deploy/p/gnoswap/uint256/arithmetic.gno b/contract/p/gnoswap/uint256/arithmetic.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/arithmetic.gno
rename to contract/p/gnoswap/uint256/arithmetic.gno
diff --git a/_deploy/p/gnoswap/uint256/arithmetic_test.gno b/contract/p/gnoswap/uint256/arithmetic_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/arithmetic_test.gno
rename to contract/p/gnoswap/uint256/arithmetic_test.gno
diff --git a/_deploy/p/gnoswap/uint256/bits_table.gno b/contract/p/gnoswap/uint256/bits_table.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/bits_table.gno
rename to contract/p/gnoswap/uint256/bits_table.gno
diff --git a/_deploy/p/gnoswap/uint256/bitwise.gno b/contract/p/gnoswap/uint256/bitwise.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/bitwise.gno
rename to contract/p/gnoswap/uint256/bitwise.gno
diff --git a/_deploy/p/gnoswap/uint256/bitwise_test.gno b/contract/p/gnoswap/uint256/bitwise_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/bitwise_test.gno
rename to contract/p/gnoswap/uint256/bitwise_test.gno
diff --git a/_deploy/p/gnoswap/uint256/cmp.gno b/contract/p/gnoswap/uint256/cmp.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/cmp.gno
rename to contract/p/gnoswap/uint256/cmp.gno
diff --git a/_deploy/p/gnoswap/uint256/cmp_test.gno b/contract/p/gnoswap/uint256/cmp_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/cmp_test.gno
rename to contract/p/gnoswap/uint256/cmp_test.gno
diff --git a/_deploy/p/gnoswap/uint256/conversion.gno b/contract/p/gnoswap/uint256/conversion.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/conversion.gno
rename to contract/p/gnoswap/uint256/conversion.gno
diff --git a/_deploy/p/gnoswap/uint256/conversion_test.gno b/contract/p/gnoswap/uint256/conversion_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/conversion_test.gno
rename to contract/p/gnoswap/uint256/conversion_test.gno
diff --git a/_deploy/p/gnoswap/uint256/error.gno b/contract/p/gnoswap/uint256/error.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/error.gno
rename to contract/p/gnoswap/uint256/error.gno
diff --git a/_deploy/p/gnoswap/uint256/fullmath.gno b/contract/p/gnoswap/uint256/fullmath.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/fullmath.gno
rename to contract/p/gnoswap/uint256/fullmath.gno
diff --git a/_deploy/p/gnoswap/uint256/fullmath_test.gno b/contract/p/gnoswap/uint256/fullmath_test.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/fullmath_test.gno
rename to contract/p/gnoswap/uint256/fullmath_test.gno
diff --git a/_deploy/p/gnoswap/uint256/gno.mod b/contract/p/gnoswap/uint256/gno.mod
similarity index 100%
rename from _deploy/p/gnoswap/uint256/gno.mod
rename to contract/p/gnoswap/uint256/gno.mod
diff --git a/_deploy/p/gnoswap/uint256/gs_pointer.gno b/contract/p/gnoswap/uint256/gs_pointer.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/gs_pointer.gno
rename to contract/p/gnoswap/uint256/gs_pointer.gno
diff --git a/_deploy/p/gnoswap/uint256/mod.gno b/contract/p/gnoswap/uint256/mod.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/mod.gno
rename to contract/p/gnoswap/uint256/mod.gno
diff --git a/_deploy/p/gnoswap/uint256/uint256.gno b/contract/p/gnoswap/uint256/uint256.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/uint256.gno
rename to contract/p/gnoswap/uint256/uint256.gno
diff --git a/_deploy/p/gnoswap/uint256/utils.gno b/contract/p/gnoswap/uint256/utils.gno
similarity index 100%
rename from _deploy/p/gnoswap/uint256/utils.gno
rename to contract/p/gnoswap/uint256/utils.gno
diff --git a/_deploy/r/gnoswap/common/access.gno b/contract/r/gnoswap/v1/common/access.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/access.gno
rename to contract/r/gnoswap/v1/common/access.gno
diff --git a/_deploy/r/gnoswap/common/access_test.gno b/contract/r/gnoswap/v1/common/access_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/access_test.gno
rename to contract/r/gnoswap/v1/common/access_test.gno
diff --git a/_deploy/r/gnoswap/common/address_and_username.gno b/contract/r/gnoswap/v1/common/address_and_username.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/address_and_username.gno
rename to contract/r/gnoswap/v1/common/address_and_username.gno
diff --git a/_deploy/r/gnoswap/common/address_and_username_test.gno b/contract/r/gnoswap/v1/common/address_and_username_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/address_and_username_test.gno
rename to contract/r/gnoswap/v1/common/address_and_username_test.gno
diff --git a/_deploy/r/gnoswap/common/errors.gno b/contract/r/gnoswap/v1/common/errors.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/errors.gno
rename to contract/r/gnoswap/v1/common/errors.gno
diff --git a/_deploy/r/gnoswap/common/gno.mod b/contract/r/gnoswap/v1/common/gno.mod
similarity index 100%
rename from _deploy/r/gnoswap/common/gno.mod
rename to contract/r/gnoswap/v1/common/gno.mod
diff --git a/_deploy/r/gnoswap/common/grc20reg_helper.gno b/contract/r/gnoswap/v1/common/grc20reg_helper.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/grc20reg_helper.gno
rename to contract/r/gnoswap/v1/common/grc20reg_helper.gno
diff --git a/_deploy/r/gnoswap/common/grc20reg_helper_test.gno b/contract/r/gnoswap/v1/common/grc20reg_helper_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/grc20reg_helper_test.gno
rename to contract/r/gnoswap/v1/common/grc20reg_helper_test.gno
diff --git a/_deploy/r/gnoswap/common/grc721_token_id.gno b/contract/r/gnoswap/v1/common/grc721_token_id.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/grc721_token_id.gno
rename to contract/r/gnoswap/v1/common/grc721_token_id.gno
diff --git a/_deploy/r/gnoswap/common/grc721_token_id_test.gno b/contract/r/gnoswap/v1/common/grc721_token_id_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/grc721_token_id_test.gno
rename to contract/r/gnoswap/v1/common/grc721_token_id_test.gno
diff --git a/_deploy/r/gnoswap/common/halt.gno b/contract/r/gnoswap/v1/common/halt.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/halt.gno
rename to contract/r/gnoswap/v1/common/halt.gno
diff --git a/_deploy/r/gnoswap/common/halt_test.gno b/contract/r/gnoswap/v1/common/halt_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/halt_test.gno
rename to contract/r/gnoswap/v1/common/halt_test.gno
diff --git a/_deploy/r/gnoswap/common/limit_caller.gno b/contract/r/gnoswap/v1/common/limit_caller.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/limit_caller.gno
rename to contract/r/gnoswap/v1/common/limit_caller.gno
diff --git a/_deploy/r/gnoswap/common/limit_caller_test.gno b/contract/r/gnoswap/v1/common/limit_caller_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/limit_caller_test.gno
rename to contract/r/gnoswap/v1/common/limit_caller_test.gno
diff --git a/_deploy/r/gnoswap/common/liquidity_amounts.gno b/contract/r/gnoswap/v1/common/liquidity_amounts.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/liquidity_amounts.gno
rename to contract/r/gnoswap/v1/common/liquidity_amounts.gno
diff --git a/_deploy/r/gnoswap/common/liquidity_amounts_test.gno b/contract/r/gnoswap/v1/common/liquidity_amounts_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/liquidity_amounts_test.gno
rename to contract/r/gnoswap/v1/common/liquidity_amounts_test.gno
diff --git a/_deploy/r/gnoswap/common/math.gno b/contract/r/gnoswap/v1/common/math.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/math.gno
rename to contract/r/gnoswap/v1/common/math.gno
diff --git a/_deploy/r/gnoswap/common/math_test.gno b/contract/r/gnoswap/v1/common/math_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/math_test.gno
rename to contract/r/gnoswap/v1/common/math_test.gno
diff --git a/_deploy/r/gnoswap/common/strings.gno b/contract/r/gnoswap/v1/common/strings.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/strings.gno
rename to contract/r/gnoswap/v1/common/strings.gno
diff --git a/_deploy/r/gnoswap/common/tick_math.gno b/contract/r/gnoswap/v1/common/tick_math.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/tick_math.gno
rename to contract/r/gnoswap/v1/common/tick_math.gno
diff --git a/_deploy/r/gnoswap/common/tick_math_test.gno b/contract/r/gnoswap/v1/common/tick_math_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/tick_math_test.gno
rename to contract/r/gnoswap/v1/common/tick_math_test.gno
diff --git a/_deploy/r/gnoswap/common/util.gno b/contract/r/gnoswap/v1/common/util.gno
similarity index 100%
rename from _deploy/r/gnoswap/common/util.gno
rename to contract/r/gnoswap/v1/common/util.gno
diff --git a/community_pool/community_pool.gno b/contract/r/gnoswap/v1/community_pool/community_pool.gno
similarity index 100%
rename from community_pool/community_pool.gno
rename to contract/r/gnoswap/v1/community_pool/community_pool.gno
diff --git a/community_pool/community_pool_test.gno b/contract/r/gnoswap/v1/community_pool/community_pool_test.gno
similarity index 100%
rename from community_pool/community_pool_test.gno
rename to contract/r/gnoswap/v1/community_pool/community_pool_test.gno
diff --git a/community_pool/errors.gno b/contract/r/gnoswap/v1/community_pool/errors.gno
similarity index 100%
rename from community_pool/errors.gno
rename to contract/r/gnoswap/v1/community_pool/errors.gno
diff --git a/community_pool/gno.mod b/contract/r/gnoswap/v1/community_pool/gno.mod
similarity index 100%
rename from community_pool/gno.mod
rename to contract/r/gnoswap/v1/community_pool/gno.mod
diff --git a/community_pool/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
similarity index 100%
rename from community_pool/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
rename to contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
diff --git a/community_pool/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
similarity index 100%
rename from community_pool/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
rename to contract/r/gnoswap/v1/community_pool/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
diff --git a/_deploy/r/gnoswap/consts/consts.gno b/contract/r/gnoswap/v1/consts/consts.gno
similarity index 100%
rename from _deploy/r/gnoswap/consts/consts.gno
rename to contract/r/gnoswap/v1/consts/consts.gno
diff --git a/_deploy/r/gnoswap/consts/gno.mod b/contract/r/gnoswap/v1/consts/gno.mod
similarity index 100%
rename from _deploy/r/gnoswap/consts/gno.mod
rename to contract/r/gnoswap/v1/consts/gno.mod
diff --git a/emission/_test_helper.gno b/contract/r/gnoswap/v1/emission/_test_helper.gno
similarity index 100%
rename from emission/_test_helper.gno
rename to contract/r/gnoswap/v1/emission/_test_helper.gno
diff --git a/emission/callback.gno b/contract/r/gnoswap/v1/emission/callback.gno
similarity index 100%
rename from emission/callback.gno
rename to contract/r/gnoswap/v1/emission/callback.gno
diff --git a/emission/distribution.gno b/contract/r/gnoswap/v1/emission/distribution.gno
similarity index 100%
rename from emission/distribution.gno
rename to contract/r/gnoswap/v1/emission/distribution.gno
diff --git a/emission/distribution_test.gno b/contract/r/gnoswap/v1/emission/distribution_test.gno
similarity index 100%
rename from emission/distribution_test.gno
rename to contract/r/gnoswap/v1/emission/distribution_test.gno
diff --git a/emission/emission.gno b/contract/r/gnoswap/v1/emission/emission.gno
similarity index 100%
rename from emission/emission.gno
rename to contract/r/gnoswap/v1/emission/emission.gno
diff --git a/emission/emission_test.gno b/contract/r/gnoswap/v1/emission/emission_test.gno
similarity index 100%
rename from emission/emission_test.gno
rename to contract/r/gnoswap/v1/emission/emission_test.gno
diff --git a/emission/errors.gno b/contract/r/gnoswap/v1/emission/errors.gno
similarity index 100%
rename from emission/errors.gno
rename to contract/r/gnoswap/v1/emission/errors.gno
diff --git a/emission/gno.mod b/contract/r/gnoswap/v1/emission/gno.mod
similarity index 100%
rename from emission/gno.mod
rename to contract/r/gnoswap/v1/emission/gno.mod
diff --git a/emission/utils.gno b/contract/r/gnoswap/v1/emission/utils.gno
similarity index 100%
rename from emission/utils.gno
rename to contract/r/gnoswap/v1/emission/utils.gno
diff --git a/_deploy/r/gnoswap/gnft/errors.gno b/contract/r/gnoswap/v1/gnft/errors.gno
similarity index 100%
rename from _deploy/r/gnoswap/gnft/errors.gno
rename to contract/r/gnoswap/v1/gnft/errors.gno
diff --git a/_deploy/r/gnoswap/gnft/gnft.gno b/contract/r/gnoswap/v1/gnft/gnft.gno
similarity index 100%
rename from _deploy/r/gnoswap/gnft/gnft.gno
rename to contract/r/gnoswap/v1/gnft/gnft.gno
diff --git a/_deploy/r/gnoswap/gnft/gnft_test.gno b/contract/r/gnoswap/v1/gnft/gnft_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/gnft/gnft_test.gno
rename to contract/r/gnoswap/v1/gnft/gnft_test.gno
diff --git a/_deploy/r/gnoswap/gnft/gno.mod b/contract/r/gnoswap/v1/gnft/gno.mod
similarity index 100%
rename from _deploy/r/gnoswap/gnft/gno.mod
rename to contract/r/gnoswap/v1/gnft/gno.mod
diff --git a/_deploy/r/gnoswap/gnft/svg_generator.gno b/contract/r/gnoswap/v1/gnft/svg_generator.gno
similarity index 100%
rename from _deploy/r/gnoswap/gnft/svg_generator.gno
rename to contract/r/gnoswap/v1/gnft/svg_generator.gno
diff --git a/_deploy/r/gnoswap/gnft/svg_generator_test.gno b/contract/r/gnoswap/v1/gnft/svg_generator_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/gnft/svg_generator_test.gno
rename to contract/r/gnoswap/v1/gnft/svg_generator_test.gno
diff --git a/_deploy/r/gnoswap/gnft/utils.gno b/contract/r/gnoswap/v1/gnft/utils.gno
similarity index 100%
rename from _deploy/r/gnoswap/gnft/utils.gno
rename to contract/r/gnoswap/v1/gnft/utils.gno
diff --git a/_deploy/r/gnoswap/gns/_helper_test.gno b/contract/r/gnoswap/v1/gns/_helper_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/_helper_test.gno
rename to contract/r/gnoswap/v1/gns/_helper_test.gno
diff --git a/_deploy/r/gnoswap/gns/errors.gno b/contract/r/gnoswap/v1/gns/errors.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/errors.gno
rename to contract/r/gnoswap/v1/gns/errors.gno
diff --git a/_deploy/r/gnoswap/gns/gno.mod b/contract/r/gnoswap/v1/gns/gno.mod
similarity index 100%
rename from _deploy/r/gnoswap/gns/gno.mod
rename to contract/r/gnoswap/v1/gns/gno.mod
diff --git a/_deploy/r/gnoswap/gns/gns.gno b/contract/r/gnoswap/v1/gns/gns.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/gns.gno
rename to contract/r/gnoswap/v1/gns/gns.gno
diff --git a/_deploy/r/gnoswap/gns/gns_test.gno b/contract/r/gnoswap/v1/gns/gns_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/gns_test.gno
rename to contract/r/gnoswap/v1/gns/gns_test.gno
diff --git a/_deploy/r/gnoswap/gns/halving.gno b/contract/r/gnoswap/v1/gns/halving.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/halving.gno
rename to contract/r/gnoswap/v1/gns/halving.gno
diff --git a/_deploy/r/gnoswap/gns/halving_test.gno b/contract/r/gnoswap/v1/gns/halving_test.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/halving_test.gno
rename to contract/r/gnoswap/v1/gns/halving_test.gno
diff --git a/_deploy/r/gnoswap/gns/tests/gns_calculate_and_mint_test.gnoA b/contract/r/gnoswap/v1/gns/tests/gns_calculate_and_mint_test.gnoA
similarity index 100%
rename from _deploy/r/gnoswap/gns/tests/gns_calculate_and_mint_test.gnoA
rename to contract/r/gnoswap/v1/gns/tests/gns_calculate_and_mint_test.gnoA
diff --git a/_deploy/r/gnoswap/gns/tests/minted_and_left_emission_amount_test.gnoA b/contract/r/gnoswap/v1/gns/tests/minted_and_left_emission_amount_test.gnoA
similarity index 100%
rename from _deploy/r/gnoswap/gns/tests/minted_and_left_emission_amount_test.gnoA
rename to contract/r/gnoswap/v1/gns/tests/minted_and_left_emission_amount_test.gnoA
diff --git a/_deploy/r/gnoswap/gns/tests/z1_filetest.gno b/contract/r/gnoswap/v1/gns/tests/z1_filetest.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/tests/z1_filetest.gno
rename to contract/r/gnoswap/v1/gns/tests/z1_filetest.gno
diff --git a/_deploy/r/gnoswap/gns/tests/z2_filetest.gno b/contract/r/gnoswap/v1/gns/tests/z2_filetest.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/tests/z2_filetest.gno
rename to contract/r/gnoswap/v1/gns/tests/z2_filetest.gno
diff --git a/_deploy/r/gnoswap/gns/tests/z3_filetest.gno b/contract/r/gnoswap/v1/gns/tests/z3_filetest.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/tests/z3_filetest.gno
rename to contract/r/gnoswap/v1/gns/tests/z3_filetest.gno
diff --git a/_deploy/r/gnoswap/gns/tests/z4_filetest.gno b/contract/r/gnoswap/v1/gns/tests/z4_filetest.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/tests/z4_filetest.gno
rename to contract/r/gnoswap/v1/gns/tests/z4_filetest.gno
diff --git a/_deploy/r/gnoswap/gns/utils.gno b/contract/r/gnoswap/v1/gns/utils.gno
similarity index 100%
rename from _deploy/r/gnoswap/gns/utils.gno
rename to contract/r/gnoswap/v1/gns/utils.gno
diff --git a/gov/doc.gno b/contract/r/gnoswap/v1/gov/doc.gno
similarity index 100%
rename from gov/doc.gno
rename to contract/r/gnoswap/v1/gov/doc.gno
diff --git a/gov/governance/api.gno b/contract/r/gnoswap/v1/gov/governance/api.gno
similarity index 100%
rename from gov/governance/api.gno
rename to contract/r/gnoswap/v1/gov/governance/api.gno
diff --git a/gov/governance/api_test.gno b/contract/r/gnoswap/v1/gov/governance/api_test.gno
similarity index 100%
rename from gov/governance/api_test.gno
rename to contract/r/gnoswap/v1/gov/governance/api_test.gno
diff --git a/gov/governance/config.gno b/contract/r/gnoswap/v1/gov/governance/config.gno
similarity index 100%
rename from gov/governance/config.gno
rename to contract/r/gnoswap/v1/gov/governance/config.gno
diff --git a/gov/governance/config_test.gno b/contract/r/gnoswap/v1/gov/governance/config_test.gno
similarity index 100%
rename from gov/governance/config_test.gno
rename to contract/r/gnoswap/v1/gov/governance/config_test.gno
diff --git a/gov/governance/errors.gno b/contract/r/gnoswap/v1/gov/governance/errors.gno
similarity index 100%
rename from gov/governance/errors.gno
rename to contract/r/gnoswap/v1/gov/governance/errors.gno
diff --git a/gov/governance/execute.gno b/contract/r/gnoswap/v1/gov/governance/execute.gno
similarity index 100%
rename from gov/governance/execute.gno
rename to contract/r/gnoswap/v1/gov/governance/execute.gno
diff --git a/gov/governance/execute_test.gno b/contract/r/gnoswap/v1/gov/governance/execute_test.gno
similarity index 100%
rename from gov/governance/execute_test.gno
rename to contract/r/gnoswap/v1/gov/governance/execute_test.gno
diff --git a/gov/governance/fn_registry.gno b/contract/r/gnoswap/v1/gov/governance/fn_registry.gno
similarity index 100%
rename from gov/governance/fn_registry.gno
rename to contract/r/gnoswap/v1/gov/governance/fn_registry.gno
diff --git a/gov/governance/fn_registry_test.gno b/contract/r/gnoswap/v1/gov/governance/fn_registry_test.gno
similarity index 100%
rename from gov/governance/fn_registry_test.gno
rename to contract/r/gnoswap/v1/gov/governance/fn_registry_test.gno
diff --git a/gov/governance/getter_proposal.gno b/contract/r/gnoswap/v1/gov/governance/getter_proposal.gno
similarity index 100%
rename from gov/governance/getter_proposal.gno
rename to contract/r/gnoswap/v1/gov/governance/getter_proposal.gno
diff --git a/gov/governance/getter_vote.gno b/contract/r/gnoswap/v1/gov/governance/getter_vote.gno
similarity index 100%
rename from gov/governance/getter_vote.gno
rename to contract/r/gnoswap/v1/gov/governance/getter_vote.gno
diff --git a/gov/governance/gno.mod b/contract/r/gnoswap/v1/gov/governance/gno.mod
similarity index 100%
rename from gov/governance/gno.mod
rename to contract/r/gnoswap/v1/gov/governance/gno.mod
diff --git a/gov/governance/proposal.gno b/contract/r/gnoswap/v1/gov/governance/proposal.gno
similarity index 100%
rename from gov/governance/proposal.gno
rename to contract/r/gnoswap/v1/gov/governance/proposal.gno
diff --git a/gov/governance/proposal_test.gno b/contract/r/gnoswap/v1/gov/governance/proposal_test.gno
similarity index 100%
rename from gov/governance/proposal_test.gno
rename to contract/r/gnoswap/v1/gov/governance/proposal_test.gno
diff --git a/gov/governance/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
similarity index 100%
rename from gov/governance/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
diff --git a/gov/governance/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
similarity index 100%
rename from gov/governance/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
diff --git a/gov/governance/tests/__TEST_governance_proposal_MULTI_execute_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_MULTI_execute_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_proposal_MULTI_execute_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_MULTI_execute_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_community_pool_spend_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_proposal_execute_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_execute_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_proposal_execute_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_execute_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_proposal_status_update_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_status_update_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_proposal_status_update_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_status_update_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_proposal_text_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_text_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_proposal_text_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_proposal_text_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_vote_gov_delegated_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_vote_gov_delegated_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_after_propose_before_vote_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_before_propose_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_before_propose_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_before_propose_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_gov_delegated_undelegated_before_propose_test.gnoA
diff --git a/gov/governance/tests/__TEST_governance_vote_with_launchpad_xgns_test.gnoA b/contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_with_launchpad_xgns_test.gnoA
similarity index 100%
rename from gov/governance/tests/__TEST_governance_vote_with_launchpad_xgns_test.gnoA
rename to contract/r/gnoswap/v1/gov/governance/tests/__TEST_governance_vote_with_launchpad_xgns_test.gnoA
diff --git a/gov/governance/type.gno b/contract/r/gnoswap/v1/gov/governance/type.gno
similarity index 100%
rename from gov/governance/type.gno
rename to contract/r/gnoswap/v1/gov/governance/type.gno
diff --git a/gov/governance/utils.gno b/contract/r/gnoswap/v1/gov/governance/utils.gno
similarity index 100%
rename from gov/governance/utils.gno
rename to contract/r/gnoswap/v1/gov/governance/utils.gno
diff --git a/gov/governance/vote.gno b/contract/r/gnoswap/v1/gov/governance/vote.gno
similarity index 100%
rename from gov/governance/vote.gno
rename to contract/r/gnoswap/v1/gov/governance/vote.gno
diff --git a/gov/governance/vote_test.gno b/contract/r/gnoswap/v1/gov/governance/vote_test.gno
similarity index 100%
rename from gov/governance/vote_test.gno
rename to contract/r/gnoswap/v1/gov/governance/vote_test.gno
diff --git a/gov/staker/api_delegation.gno b/contract/r/gnoswap/v1/gov/staker/api_delegation.gno
similarity index 100%
rename from gov/staker/api_delegation.gno
rename to contract/r/gnoswap/v1/gov/staker/api_delegation.gno
diff --git a/gov/staker/api_history.gno b/contract/r/gnoswap/v1/gov/staker/api_history.gno
similarity index 100%
rename from gov/staker/api_history.gno
rename to contract/r/gnoswap/v1/gov/staker/api_history.gno
diff --git a/gov/staker/api_staker.gno b/contract/r/gnoswap/v1/gov/staker/api_staker.gno
similarity index 100%
rename from gov/staker/api_staker.gno
rename to contract/r/gnoswap/v1/gov/staker/api_staker.gno
diff --git a/gov/staker/api_staker_test.gno b/contract/r/gnoswap/v1/gov/staker/api_staker_test.gno
similarity index 100%
rename from gov/staker/api_staker_test.gno
rename to contract/r/gnoswap/v1/gov/staker/api_staker_test.gno
diff --git a/gov/staker/clean_delegation_stat_history.gno b/contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history.gno
similarity index 100%
rename from gov/staker/clean_delegation_stat_history.gno
rename to contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history.gno
diff --git a/gov/staker/clean_delegation_stat_history_test.gno b/contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history_test.gno
similarity index 100%
rename from gov/staker/clean_delegation_stat_history_test.gno
rename to contract/r/gnoswap/v1/gov/staker/clean_delegation_stat_history_test.gno
diff --git a/gov/staker/delegate_undelegate.gno b/contract/r/gnoswap/v1/gov/staker/delegate_undelegate.gno
similarity index 100%
rename from gov/staker/delegate_undelegate.gno
rename to contract/r/gnoswap/v1/gov/staker/delegate_undelegate.gno
diff --git a/gov/staker/delegate_undelegate_test.gno b/contract/r/gnoswap/v1/gov/staker/delegate_undelegate_test.gno
similarity index 100%
rename from gov/staker/delegate_undelegate_test.gno
rename to contract/r/gnoswap/v1/gov/staker/delegate_undelegate_test.gno
diff --git a/gov/staker/errors.gno b/contract/r/gnoswap/v1/gov/staker/errors.gno
similarity index 100%
rename from gov/staker/errors.gno
rename to contract/r/gnoswap/v1/gov/staker/errors.gno
diff --git a/gov/staker/gno.mod b/contract/r/gnoswap/v1/gov/staker/gno.mod
similarity index 100%
rename from gov/staker/gno.mod
rename to contract/r/gnoswap/v1/gov/staker/gno.mod
diff --git a/gov/staker/history.gno b/contract/r/gnoswap/v1/gov/staker/history.gno
similarity index 100%
rename from gov/staker/history.gno
rename to contract/r/gnoswap/v1/gov/staker/history.gno
diff --git a/gov/staker/history_test.gno b/contract/r/gnoswap/v1/gov/staker/history_test.gno
similarity index 100%
rename from gov/staker/history_test.gno
rename to contract/r/gnoswap/v1/gov/staker/history_test.gno
diff --git a/gov/staker/reward_calculation.gno b/contract/r/gnoswap/v1/gov/staker/reward_calculation.gno
similarity index 100%
rename from gov/staker/reward_calculation.gno
rename to contract/r/gnoswap/v1/gov/staker/reward_calculation.gno
diff --git a/gov/staker/reward_calculation_test.gno b/contract/r/gnoswap/v1/gov/staker/reward_calculation_test.gno
similarity index 100%
rename from gov/staker/reward_calculation_test.gno
rename to contract/r/gnoswap/v1/gov/staker/reward_calculation_test.gno
diff --git a/gov/staker/staker.gno b/contract/r/gnoswap/v1/gov/staker/staker.gno
similarity index 100%
rename from gov/staker/staker.gno
rename to contract/r/gnoswap/v1/gov/staker/staker.gno
diff --git a/gov/staker/staker_test.gno b/contract/r/gnoswap/v1/gov/staker/staker_test.gno
similarity index 100%
rename from gov/staker/staker_test.gno
rename to contract/r/gnoswap/v1/gov/staker/staker_test.gno
diff --git a/gov/staker/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA
diff --git a/gov/staker/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gnoA
diff --git a/gov/staker/tests/__TEST_api_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_api_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_api_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_api_test.gnoA
diff --git a/gov/staker/tests/__TEST_emission_gns_mint_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_emission_gns_mint_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_emission_gns_mint_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_emission_gns_mint_test.gnoA
diff --git a/gov/staker/tests/__TEST_governance_reward_emission_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_emission_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_governance_reward_emission_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_emission_test.gnoA
diff --git a/gov/staker/tests/__TEST_governance_reward_protocol_fee_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_governance_reward_protocol_fee_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_test.gnoA
diff --git a/gov/staker/tests/__TEST_governance_reward_protocol_fee_with_launchpad_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_with_launchpad_test.gnoA
similarity index 100%
rename from gov/staker/tests/__TEST_governance_reward_protocol_fee_with_launchpad_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/__TEST_governance_reward_protocol_fee_with_launchpad_test.gnoA
diff --git a/gov/staker/tests/clean_delegation_stat_history_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/clean_delegation_stat_history_test.gnoA
similarity index 100%
rename from gov/staker/tests/clean_delegation_stat_history_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/clean_delegation_stat_history_test.gnoA
diff --git a/gov/staker/tests/history_test.gnoA b/contract/r/gnoswap/v1/gov/staker/tests/history_test.gnoA
similarity index 100%
rename from gov/staker/tests/history_test.gnoA
rename to contract/r/gnoswap/v1/gov/staker/tests/history_test.gnoA
diff --git a/gov/staker/util.gno b/contract/r/gnoswap/v1/gov/staker/util.gno
similarity index 100%
rename from gov/staker/util.gno
rename to contract/r/gnoswap/v1/gov/staker/util.gno
diff --git a/gov/staker/util_test.gno b/contract/r/gnoswap/v1/gov/staker/util_test.gno
similarity index 100%
rename from gov/staker/util_test.gno
rename to contract/r/gnoswap/v1/gov/staker/util_test.gno
diff --git a/gov/xgns/errors.gno b/contract/r/gnoswap/v1/gov/xgns/errors.gno
similarity index 100%
rename from gov/xgns/errors.gno
rename to contract/r/gnoswap/v1/gov/xgns/errors.gno
diff --git a/gov/xgns/gno.mod b/contract/r/gnoswap/v1/gov/xgns/gno.mod
similarity index 100%
rename from gov/xgns/gno.mod
rename to contract/r/gnoswap/v1/gov/xgns/gno.mod
diff --git a/gov/xgns/xgns.gno b/contract/r/gnoswap/v1/gov/xgns/xgns.gno
similarity index 100%
rename from gov/xgns/xgns.gno
rename to contract/r/gnoswap/v1/gov/xgns/xgns.gno
diff --git a/gov/xgns/xgns_test.gno b/contract/r/gnoswap/v1/gov/xgns/xgns_test.gno
similarity index 100%
rename from gov/xgns/xgns_test.gno
rename to contract/r/gnoswap/v1/gov/xgns/xgns_test.gno
diff --git a/launchpad/_helper_test.gno b/contract/r/gnoswap/v1/launchpad/_helper_test.gno
similarity index 100%
rename from launchpad/_helper_test.gno
rename to contract/r/gnoswap/v1/launchpad/_helper_test.gno
diff --git a/launchpad/api_deposit.gno b/contract/r/gnoswap/v1/launchpad/api_deposit.gno
similarity index 100%
rename from launchpad/api_deposit.gno
rename to contract/r/gnoswap/v1/launchpad/api_deposit.gno
diff --git a/launchpad/api_project.gno b/contract/r/gnoswap/v1/launchpad/api_project.gno
similarity index 100%
rename from launchpad/api_project.gno
rename to contract/r/gnoswap/v1/launchpad/api_project.gno
diff --git a/launchpad/api_reward.gno b/contract/r/gnoswap/v1/launchpad/api_reward.gno
similarity index 100%
rename from launchpad/api_reward.gno
rename to contract/r/gnoswap/v1/launchpad/api_reward.gno
diff --git a/launchpad/consts.gno b/contract/r/gnoswap/v1/launchpad/consts.gno
similarity index 100%
rename from launchpad/consts.gno
rename to contract/r/gnoswap/v1/launchpad/consts.gno
diff --git a/launchpad/deposit.gno b/contract/r/gnoswap/v1/launchpad/deposit.gno
similarity index 100%
rename from launchpad/deposit.gno
rename to contract/r/gnoswap/v1/launchpad/deposit.gno
diff --git a/launchpad/deposit_test.gno b/contract/r/gnoswap/v1/launchpad/deposit_test.gno
similarity index 100%
rename from launchpad/deposit_test.gno
rename to contract/r/gnoswap/v1/launchpad/deposit_test.gno
diff --git a/launchpad/doc.gno b/contract/r/gnoswap/v1/launchpad/doc.gno
similarity index 100%
rename from launchpad/doc.gno
rename to contract/r/gnoswap/v1/launchpad/doc.gno
diff --git a/launchpad/errors.gno b/contract/r/gnoswap/v1/launchpad/errors.gno
similarity index 100%
rename from launchpad/errors.gno
rename to contract/r/gnoswap/v1/launchpad/errors.gno
diff --git a/launchpad/gno.mod b/contract/r/gnoswap/v1/launchpad/gno.mod
similarity index 100%
rename from launchpad/gno.mod
rename to contract/r/gnoswap/v1/launchpad/gno.mod
diff --git a/launchpad/json_builder.gno b/contract/r/gnoswap/v1/launchpad/json_builder.gno
similarity index 100%
rename from launchpad/json_builder.gno
rename to contract/r/gnoswap/v1/launchpad/json_builder.gno
diff --git a/launchpad/json_builder_test.gno b/contract/r/gnoswap/v1/launchpad/json_builder_test.gno
similarity index 100%
rename from launchpad/json_builder_test.gno
rename to contract/r/gnoswap/v1/launchpad/json_builder_test.gno
diff --git a/launchpad/launchpad.gno b/contract/r/gnoswap/v1/launchpad/launchpad.gno
similarity index 100%
rename from launchpad/launchpad.gno
rename to contract/r/gnoswap/v1/launchpad/launchpad.gno
diff --git a/launchpad/launchpad_test.gno b/contract/r/gnoswap/v1/launchpad/launchpad_test.gno
similarity index 100%
rename from launchpad/launchpad_test.gno
rename to contract/r/gnoswap/v1/launchpad/launchpad_test.gno
diff --git a/launchpad/reward.gno b/contract/r/gnoswap/v1/launchpad/reward.gno
similarity index 100%
rename from launchpad/reward.gno
rename to contract/r/gnoswap/v1/launchpad/reward.gno
diff --git a/launchpad/reward_calculation.gno b/contract/r/gnoswap/v1/launchpad/reward_calculation.gno
similarity index 100%
rename from launchpad/reward_calculation.gno
rename to contract/r/gnoswap/v1/launchpad/reward_calculation.gno
diff --git a/launchpad/reward_calculation_test.gno b/contract/r/gnoswap/v1/launchpad/reward_calculation_test.gno
similarity index 100%
rename from launchpad/reward_calculation_test.gno
rename to contract/r/gnoswap/v1/launchpad/reward_calculation_test.gno
diff --git a/launchpad/reward_test.gno b/contract/r/gnoswap/v1/launchpad/reward_test.gno
similarity index 100%
rename from launchpad/reward_test.gno
rename to contract/r/gnoswap/v1/launchpad/reward_test.gno
diff --git a/launchpad/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
similarity index 100%
rename from launchpad/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
diff --git a/launchpad/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
similarity index 100%
rename from launchpad/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
diff --git a/launchpad/tests/__TEST_RPC_api_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_RPC_api_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_RPC_api_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_RPC_api_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_create_project_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_create_project_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_create_project_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_create_project_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_deposit_project_single_recipient_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_single_recipient_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_deposit_project_single_recipient_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_single_recipient_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_deposit_project_two_recipient_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_two_recipient_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_deposit_project_two_recipient_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_deposit_project_two_recipient_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_refund_ended_proejct_no_deposit_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_no_deposit_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_refund_ended_proejct_no_deposit_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_no_deposit_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_refund_ended_proejct_with_tier30_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_with_tier30_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_refund_ended_proejct_with_tier30_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_refund_ended_proejct_with_tier30_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_01_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_01_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_reward_and_gov_reward_01_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_01_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_02_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_02_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_reward_and_gov_reward_02_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_02_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_03_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_03_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_reward_and_gov_reward_03_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_reward_and_gov_reward_03_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier180_single_deposit_reward_by_proejct_tier_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_01_deposit_collect_gns_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_02_deposit_reward_by_proejct_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_03_deposit_reward_by_deposit_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_single_deposit_04_deposit_reward_by_deposit_endheight_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier30_two_deposit_reward_by_project_test.gno b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_two_deposit_reward_by_project_test.gno
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier30_two_deposit_reward_by_project_test.gno
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier30_two_deposit_reward_by_project_test.gno
diff --git a/launchpad/tests/__TEST_launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier90_single_deposit_reward_by_proejct_tier_test.gnoA
diff --git a/launchpad/tests/__TEST_launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA b/contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA
similarity index 100%
rename from launchpad/tests/__TEST_launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA
rename to contract/r/gnoswap/v1/launchpad/tests/__TEST_launchpad_tier_all_single_deposit_reward_by_proejct_tier_test.gnoA
diff --git a/launchpad/type.gno b/contract/r/gnoswap/v1/launchpad/type.gno
similarity index 100%
rename from launchpad/type.gno
rename to contract/r/gnoswap/v1/launchpad/type.gno
diff --git a/launchpad/util.gno b/contract/r/gnoswap/v1/launchpad/util.gno
similarity index 100%
rename from launchpad/util.gno
rename to contract/r/gnoswap/v1/launchpad/util.gno
diff --git a/pool/_helper_test.gno b/contract/r/gnoswap/v1/pool/_helper_test.gno
similarity index 100%
rename from pool/_helper_test.gno
rename to contract/r/gnoswap/v1/pool/_helper_test.gno
diff --git a/pool/api.gno b/contract/r/gnoswap/v1/pool/api.gno
similarity index 100%
rename from pool/api.gno
rename to contract/r/gnoswap/v1/pool/api.gno
diff --git a/pool/api_test.gno b/contract/r/gnoswap/v1/pool/api_test.gno
similarity index 100%
rename from pool/api_test.gno
rename to contract/r/gnoswap/v1/pool/api_test.gno
diff --git a/pool/doc.gno b/contract/r/gnoswap/v1/pool/doc.gno
similarity index 100%
rename from pool/doc.gno
rename to contract/r/gnoswap/v1/pool/doc.gno
diff --git a/pool/errors.gno b/contract/r/gnoswap/v1/pool/errors.gno
similarity index 100%
rename from pool/errors.gno
rename to contract/r/gnoswap/v1/pool/errors.gno
diff --git a/pool/getter.gno b/contract/r/gnoswap/v1/pool/getter.gno
similarity index 100%
rename from pool/getter.gno
rename to contract/r/gnoswap/v1/pool/getter.gno
diff --git a/pool/getter_test.gno b/contract/r/gnoswap/v1/pool/getter_test.gno
similarity index 100%
rename from pool/getter_test.gno
rename to contract/r/gnoswap/v1/pool/getter_test.gno
diff --git a/pool/gno.mod b/contract/r/gnoswap/v1/pool/gno.mod
similarity index 100%
rename from pool/gno.mod
rename to contract/r/gnoswap/v1/pool/gno.mod
diff --git a/pool/liquidity_math.gno b/contract/r/gnoswap/v1/pool/liquidity_math.gno
similarity index 100%
rename from pool/liquidity_math.gno
rename to contract/r/gnoswap/v1/pool/liquidity_math.gno
diff --git a/pool/liquidity_math_test.gno b/contract/r/gnoswap/v1/pool/liquidity_math_test.gno
similarity index 100%
rename from pool/liquidity_math_test.gno
rename to contract/r/gnoswap/v1/pool/liquidity_math_test.gno
diff --git a/pool/pool.gno b/contract/r/gnoswap/v1/pool/pool.gno
similarity index 100%
rename from pool/pool.gno
rename to contract/r/gnoswap/v1/pool/pool.gno
diff --git a/pool/pool_manager.gno b/contract/r/gnoswap/v1/pool/pool_manager.gno
similarity index 100%
rename from pool/pool_manager.gno
rename to contract/r/gnoswap/v1/pool/pool_manager.gno
diff --git a/pool/pool_manager_test.gno b/contract/r/gnoswap/v1/pool/pool_manager_test.gno
similarity index 100%
rename from pool/pool_manager_test.gno
rename to contract/r/gnoswap/v1/pool/pool_manager_test.gno
diff --git a/pool/pool_test.gno b/contract/r/gnoswap/v1/pool/pool_test.gno
similarity index 100%
rename from pool/pool_test.gno
rename to contract/r/gnoswap/v1/pool/pool_test.gno
diff --git a/pool/pool_transfer.gno b/contract/r/gnoswap/v1/pool/pool_transfer.gno
similarity index 100%
rename from pool/pool_transfer.gno
rename to contract/r/gnoswap/v1/pool/pool_transfer.gno
diff --git a/pool/pool_transfer_test.gno b/contract/r/gnoswap/v1/pool/pool_transfer_test.gno
similarity index 100%
rename from pool/pool_transfer_test.gno
rename to contract/r/gnoswap/v1/pool/pool_transfer_test.gno
diff --git a/pool/position.gno b/contract/r/gnoswap/v1/pool/position.gno
similarity index 100%
rename from pool/position.gno
rename to contract/r/gnoswap/v1/pool/position.gno
diff --git a/pool/position_modify.gno b/contract/r/gnoswap/v1/pool/position_modify.gno
similarity index 100%
rename from pool/position_modify.gno
rename to contract/r/gnoswap/v1/pool/position_modify.gno
diff --git a/pool/position_modify_test.gno b/contract/r/gnoswap/v1/pool/position_modify_test.gno
similarity index 100%
rename from pool/position_modify_test.gno
rename to contract/r/gnoswap/v1/pool/position_modify_test.gno
diff --git a/pool/position_test.gno b/contract/r/gnoswap/v1/pool/position_test.gno
similarity index 100%
rename from pool/position_test.gno
rename to contract/r/gnoswap/v1/pool/position_test.gno
diff --git a/pool/position_update.gno b/contract/r/gnoswap/v1/pool/position_update.gno
similarity index 100%
rename from pool/position_update.gno
rename to contract/r/gnoswap/v1/pool/position_update.gno
diff --git a/pool/position_update_test.gno b/contract/r/gnoswap/v1/pool/position_update_test.gno
similarity index 100%
rename from pool/position_update_test.gno
rename to contract/r/gnoswap/v1/pool/position_update_test.gno
diff --git a/pool/protocol_fee_pool_creation.gno b/contract/r/gnoswap/v1/pool/protocol_fee_pool_creation.gno
similarity index 100%
rename from pool/protocol_fee_pool_creation.gno
rename to contract/r/gnoswap/v1/pool/protocol_fee_pool_creation.gno
diff --git a/pool/protocol_fee_pool_creation_test.gno b/contract/r/gnoswap/v1/pool/protocol_fee_pool_creation_test.gno
similarity index 100%
rename from pool/protocol_fee_pool_creation_test.gno
rename to contract/r/gnoswap/v1/pool/protocol_fee_pool_creation_test.gno
diff --git a/pool/protocol_fee_withdrawal.gno b/contract/r/gnoswap/v1/pool/protocol_fee_withdrawal.gno
similarity index 100%
rename from pool/protocol_fee_withdrawal.gno
rename to contract/r/gnoswap/v1/pool/protocol_fee_withdrawal.gno
diff --git a/pool/protocol_fee_withdrawal_test.gno b/contract/r/gnoswap/v1/pool/protocol_fee_withdrawal_test.gno
similarity index 100%
rename from pool/protocol_fee_withdrawal_test.gno
rename to contract/r/gnoswap/v1/pool/protocol_fee_withdrawal_test.gno
diff --git a/pool/swap.gno b/contract/r/gnoswap/v1/pool/swap.gno
similarity index 100%
rename from pool/swap.gno
rename to contract/r/gnoswap/v1/pool/swap.gno
diff --git a/pool/swap_test.gno b/contract/r/gnoswap/v1/pool/swap_test.gno
similarity index 100%
rename from pool/swap_test.gno
rename to contract/r/gnoswap/v1/pool/swap_test.gno
diff --git a/pool/tests/__TEST_pool_burn_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_burn_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_burn_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_burn_test.gnoA
diff --git a/pool/tests/__TEST_pool_create_pool_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_create_pool_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_create_pool_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_create_pool_test.gnoA
diff --git a/pool/tests/__TEST_pool_dryswap_and_swap_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_dryswap_and_swap_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_dryswap_and_swap_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_dryswap_and_swap_test.gnoA
diff --git a/pool/tests/__TEST_pool_fee_protocol_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_fee_protocol_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_fee_protocol_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_fee_protocol_test.gnoA
diff --git a/pool/tests/__TEST_pool_init_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_init_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_init_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_init_test.gnoA
diff --git a/pool/tests/__TEST_pool_limit_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_limit_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_test.gnoA
diff --git a/pool/tests/__TEST_pool_limit_with_protocol_fee_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_with_protocol_fee_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_limit_with_protocol_fee_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_limit_with_protocol_fee_test.gnoA
diff --git a/pool/tests/__TEST_pool_mint_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_mint_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_mint_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_mint_test.gnoA
diff --git a/pool/tests/__TEST_pool_multi_token_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_multi_token_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_multi_token_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_multi_token_test.gnoA
diff --git a/pool/tests/__TEST_pool_native_swap_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_native_swap_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_native_swap_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_native_swap_test.gnoA
diff --git a/pool/tests/__TEST_pool_single_lp_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_single_lp_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_single_lp_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_single_lp_test.gnoA
diff --git a/pool/tests/__TEST_pool_spec_#1_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#1_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_spec_#1_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#1_test.gnoA
diff --git a/pool/tests/__TEST_pool_spec_#2_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#2_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_spec_#2_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#2_test.gnoA
diff --git a/pool/tests/__TEST_pool_spec_#3_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#3_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_spec_#3_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#3_test.gnoA
diff --git a/pool/tests/__TEST_pool_spec_#4_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#4_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_spec_#4_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#4_test.gnoA
diff --git a/pool/tests/__TEST_pool_spec_#5_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#5_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_spec_#5_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#5_test.gnoA
diff --git a/pool/tests/__TEST_pool_spec_#6_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#6_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_spec_#6_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_spec_#6_test.gnoA
diff --git a/pool/tests/__TEST_pool_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_test.gnoA
diff --git a/pool/tests/__TEST_pool_tick_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_tick_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_test.gnoA
diff --git a/pool/tests/__TEST_pool_tick_transaction_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_transaction_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_pool_tick_transaction_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_pool_tick_transaction_test.gnoA
diff --git a/pool/tests/__TEST_tick_bitmap_test.gnoA b/contract/r/gnoswap/v1/pool/tests/__TEST_tick_bitmap_test.gnoA
similarity index 100%
rename from pool/tests/__TEST_tick_bitmap_test.gnoA
rename to contract/r/gnoswap/v1/pool/tests/__TEST_tick_bitmap_test.gnoA
diff --git a/pool/tick.gno b/contract/r/gnoswap/v1/pool/tick.gno
similarity index 100%
rename from pool/tick.gno
rename to contract/r/gnoswap/v1/pool/tick.gno
diff --git a/pool/tick_bitmap.gno b/contract/r/gnoswap/v1/pool/tick_bitmap.gno
similarity index 100%
rename from pool/tick_bitmap.gno
rename to contract/r/gnoswap/v1/pool/tick_bitmap.gno
diff --git a/pool/tick_bitmap_test.gno b/contract/r/gnoswap/v1/pool/tick_bitmap_test.gno
similarity index 100%
rename from pool/tick_bitmap_test.gno
rename to contract/r/gnoswap/v1/pool/tick_bitmap_test.gno
diff --git a/pool/tick_test.gno b/contract/r/gnoswap/v1/pool/tick_test.gno
similarity index 100%
rename from pool/tick_test.gno
rename to contract/r/gnoswap/v1/pool/tick_test.gno
diff --git a/pool/type.gno b/contract/r/gnoswap/v1/pool/type.gno
similarity index 100%
rename from pool/type.gno
rename to contract/r/gnoswap/v1/pool/type.gno
diff --git a/pool/utils.gno b/contract/r/gnoswap/v1/pool/utils.gno
similarity index 100%
rename from pool/utils.gno
rename to contract/r/gnoswap/v1/pool/utils.gno
diff --git a/pool/utils_test.gno b/contract/r/gnoswap/v1/pool/utils_test.gno
similarity index 100%
rename from pool/utils_test.gno
rename to contract/r/gnoswap/v1/pool/utils_test.gno
diff --git a/position/_helper_test.gno b/contract/r/gnoswap/v1/position/_helper_test.gno
similarity index 100%
rename from position/_helper_test.gno
rename to contract/r/gnoswap/v1/position/_helper_test.gno
diff --git a/position/api.gno b/contract/r/gnoswap/v1/position/api.gno
similarity index 100%
rename from position/api.gno
rename to contract/r/gnoswap/v1/position/api.gno
diff --git a/position/api_test.gno b/contract/r/gnoswap/v1/position/api_test.gno
similarity index 100%
rename from position/api_test.gno
rename to contract/r/gnoswap/v1/position/api_test.gno
diff --git a/position/doc.gno b/contract/r/gnoswap/v1/position/doc.gno
similarity index 100%
rename from position/doc.gno
rename to contract/r/gnoswap/v1/position/doc.gno
diff --git a/position/errors.gno b/contract/r/gnoswap/v1/position/errors.gno
similarity index 100%
rename from position/errors.gno
rename to contract/r/gnoswap/v1/position/errors.gno
diff --git a/position/getter.gno b/contract/r/gnoswap/v1/position/getter.gno
similarity index 100%
rename from position/getter.gno
rename to contract/r/gnoswap/v1/position/getter.gno
diff --git a/position/getter_test.gno b/contract/r/gnoswap/v1/position/getter_test.gno
similarity index 100%
rename from position/getter_test.gno
rename to contract/r/gnoswap/v1/position/getter_test.gno
diff --git a/position/gno.mod b/contract/r/gnoswap/v1/position/gno.mod
similarity index 100%
rename from position/gno.mod
rename to contract/r/gnoswap/v1/position/gno.mod
diff --git a/position/liquidity_management.gno b/contract/r/gnoswap/v1/position/liquidity_management.gno
similarity index 100%
rename from position/liquidity_management.gno
rename to contract/r/gnoswap/v1/position/liquidity_management.gno
diff --git a/position/liquidity_management_test.gno b/contract/r/gnoswap/v1/position/liquidity_management_test.gno
similarity index 100%
rename from position/liquidity_management_test.gno
rename to contract/r/gnoswap/v1/position/liquidity_management_test.gno
diff --git a/position/native_token.gno b/contract/r/gnoswap/v1/position/native_token.gno
similarity index 100%
rename from position/native_token.gno
rename to contract/r/gnoswap/v1/position/native_token.gno
diff --git a/position/native_token_test.gno b/contract/r/gnoswap/v1/position/native_token_test.gno
similarity index 100%
rename from position/native_token_test.gno
rename to contract/r/gnoswap/v1/position/native_token_test.gno
diff --git a/position/position.gno b/contract/r/gnoswap/v1/position/position.gno
similarity index 100%
rename from position/position.gno
rename to contract/r/gnoswap/v1/position/position.gno
diff --git a/position/position_test.gno b/contract/r/gnoswap/v1/position/position_test.gno
similarity index 100%
rename from position/position_test.gno
rename to contract/r/gnoswap/v1/position/position_test.gno
diff --git a/position/tests/__TEST_fee_collect_with_two_user_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_fee_collect_with_two_user_test.gnoA
similarity index 100%
rename from position/tests/__TEST_fee_collect_with_two_user_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_fee_collect_with_two_user_test.gnoA
diff --git a/position/tests/__TEST_position_api_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_api_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_api_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_api_test.gnoA
diff --git a/position/tests/__TEST_position_full_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_full_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_full_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_full_test.gnoA
diff --git a/position/tests/__TEST_position_full_with_emission_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_full_with_emission_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_full_with_emission_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_full_with_emission_test.gnoA
diff --git a/position/tests/__TEST_position_increase_burned_position_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_increase_burned_position_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_increase_burned_position_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_increase_burned_position_test.gnoA
diff --git a/position/tests/__TEST_position_increase_decrease_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_increase_decrease_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_increase_decrease_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_increase_decrease_test.gnoA
diff --git a/position/tests/__TEST_position_mint_gnot_grc20_in-range_out-range_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_mint_gnot_grc20_in-range_out-range_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_mint_gnot_grc20_in-range_out-range_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_mint_gnot_grc20_in-range_out-range_test.gnoA
diff --git a/position/tests/__TEST_position_mint_swap_burn_left_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_mint_swap_burn_left_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_mint_swap_burn_left_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_mint_swap_burn_left_test.gnoA
diff --git a/position/tests/__TEST_position_native_increase_decrease_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_native_increase_decrease_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_native_increase_decrease_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_native_increase_decrease_test.gnoA
diff --git a/position/tests/__TEST_position_native_mint_swap_burn_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_native_mint_swap_burn_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_native_mint_swap_burn_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_native_mint_swap_burn_test.gnoA
diff --git a/position/tests/__TEST_position_reposition_gnot_pair_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_gnot_pair_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_reposition_gnot_pair_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_gnot_pair_test.gnoA
diff --git a/position/tests/__TEST_position_reposition_grc20_pair_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_reposition_grc20_pair_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_test.gnoA
diff --git a/position/tests/__TEST_position_reposition_grc20_pair_with_swap_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_with_swap_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_reposition_grc20_pair_with_swap_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_reposition_grc20_pair_with_swap_test.gnoA
diff --git a/position/tests/__TEST_position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_diff_range_diff_position_swap_fee_test.gnoA
diff --git a/position/tests/__TEST_position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_same_user_same_pool_same_range_diff_position_swap_fee_test.gnoA
diff --git a/position/tests/__TEST_position_test_two_position_used_single_swap_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_test_two_position_used_single_swap_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_test_two_position_used_single_swap_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_test_two_position_used_single_swap_test.gnoA
diff --git a/position/tests/__TEST_position_tokens_owed_left_grc20_pair_more_action_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_grc20_pair_more_action_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_tokens_owed_left_grc20_pair_more_action_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_grc20_pair_more_action_test.gnoA
diff --git a/position/tests/__TEST_position_tokens_owed_left_pair_more_action_exact_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_pair_more_action_exact_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_tokens_owed_left_pair_more_action_exact_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_tokens_owed_left_pair_more_action_exact_test.gnoA
diff --git a/position/tests/__TEST_position_unclaimed_fee_test.gnoA b/contract/r/gnoswap/v1/position/tests/__TEST_position_unclaimed_fee_test.gnoA
similarity index 100%
rename from position/tests/__TEST_position_unclaimed_fee_test.gnoA
rename to contract/r/gnoswap/v1/position/tests/__TEST_position_unclaimed_fee_test.gnoA
diff --git a/position/type.gno b/contract/r/gnoswap/v1/position/type.gno
similarity index 100%
rename from position/type.gno
rename to contract/r/gnoswap/v1/position/type.gno
diff --git a/position/utils.gno b/contract/r/gnoswap/v1/position/utils.gno
similarity index 100%
rename from position/utils.gno
rename to contract/r/gnoswap/v1/position/utils.gno
diff --git a/position/utils_test.gno b/contract/r/gnoswap/v1/position/utils_test.gno
similarity index 100%
rename from position/utils_test.gno
rename to contract/r/gnoswap/v1/position/utils_test.gno
diff --git a/protocol_fee/errors.gno b/contract/r/gnoswap/v1/protocol_fee/errors.gno
similarity index 100%
rename from protocol_fee/errors.gno
rename to contract/r/gnoswap/v1/protocol_fee/errors.gno
diff --git a/protocol_fee/gno.mod b/contract/r/gnoswap/v1/protocol_fee/gno.mod
similarity index 100%
rename from protocol_fee/gno.mod
rename to contract/r/gnoswap/v1/protocol_fee/gno.mod
diff --git a/protocol_fee/protocol_fee.gno b/contract/r/gnoswap/v1/protocol_fee/protocol_fee.gno
similarity index 100%
rename from protocol_fee/protocol_fee.gno
rename to contract/r/gnoswap/v1/protocol_fee/protocol_fee.gno
diff --git a/protocol_fee/protocol_fee_test.gno b/contract/r/gnoswap/v1/protocol_fee/protocol_fee_test.gno
similarity index 100%
rename from protocol_fee/protocol_fee_test.gno
rename to contract/r/gnoswap/v1/protocol_fee/protocol_fee_test.gno
diff --git a/protocol_fee/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno b/contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
similarity index 100%
rename from protocol_fee/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
rename to contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gno
diff --git a/protocol_fee/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
similarity index 100%
rename from protocol_fee/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
rename to contract/r/gnoswap/v1/protocol_fee/tests/__TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
diff --git a/protocol_fee/token_list_with_amount.gno b/contract/r/gnoswap/v1/protocol_fee/token_list_with_amount.gno
similarity index 100%
rename from protocol_fee/token_list_with_amount.gno
rename to contract/r/gnoswap/v1/protocol_fee/token_list_with_amount.gno
diff --git a/protocol_fee/token_list_with_amount_test.gno b/contract/r/gnoswap/v1/protocol_fee/token_list_with_amount_test.gno
similarity index 100%
rename from protocol_fee/token_list_with_amount_test.gno
rename to contract/r/gnoswap/v1/protocol_fee/token_list_with_amount_test.gno
diff --git a/protocol_fee/utils.gno b/contract/r/gnoswap/v1/protocol_fee/utils.gno
similarity index 100%
rename from protocol_fee/utils.gno
rename to contract/r/gnoswap/v1/protocol_fee/utils.gno
diff --git a/referral/doc.gno b/contract/r/gnoswap/v1/referral/doc.gno
similarity index 100%
rename from referral/doc.gno
rename to contract/r/gnoswap/v1/referral/doc.gno
diff --git a/referral/errors.gno b/contract/r/gnoswap/v1/referral/errors.gno
similarity index 100%
rename from referral/errors.gno
rename to contract/r/gnoswap/v1/referral/errors.gno
diff --git a/referral/global_keeper.gno b/contract/r/gnoswap/v1/referral/global_keeper.gno
similarity index 100%
rename from referral/global_keeper.gno
rename to contract/r/gnoswap/v1/referral/global_keeper.gno
diff --git a/referral/gno.mod b/contract/r/gnoswap/v1/referral/gno.mod
similarity index 100%
rename from referral/gno.mod
rename to contract/r/gnoswap/v1/referral/gno.mod
diff --git a/referral/keeper.gno b/contract/r/gnoswap/v1/referral/keeper.gno
similarity index 100%
rename from referral/keeper.gno
rename to contract/r/gnoswap/v1/referral/keeper.gno
diff --git a/referral/keeper_test.gno b/contract/r/gnoswap/v1/referral/keeper_test.gno
similarity index 100%
rename from referral/keeper_test.gno
rename to contract/r/gnoswap/v1/referral/keeper_test.gno
diff --git a/referral/referral.gno b/contract/r/gnoswap/v1/referral/referral.gno
similarity index 100%
rename from referral/referral.gno
rename to contract/r/gnoswap/v1/referral/referral.gno
diff --git a/referral/type.gno b/contract/r/gnoswap/v1/referral/type.gno
similarity index 100%
rename from referral/type.gno
rename to contract/r/gnoswap/v1/referral/type.gno
diff --git a/referral/utils.gno b/contract/r/gnoswap/v1/referral/utils.gno
similarity index 100%
rename from referral/utils.gno
rename to contract/r/gnoswap/v1/referral/utils.gno
diff --git a/router/_helper_test.gno b/contract/r/gnoswap/v1/router/_helper_test.gno
similarity index 100%
rename from router/_helper_test.gno
rename to contract/r/gnoswap/v1/router/_helper_test.gno
diff --git a/router/base.gno b/contract/r/gnoswap/v1/router/base.gno
similarity index 100%
rename from router/base.gno
rename to contract/r/gnoswap/v1/router/base.gno
diff --git a/router/base_test.gno b/contract/r/gnoswap/v1/router/base_test.gno
similarity index 100%
rename from router/base_test.gno
rename to contract/r/gnoswap/v1/router/base_test.gno
diff --git a/router/doc.gno b/contract/r/gnoswap/v1/router/doc.gno
similarity index 100%
rename from router/doc.gno
rename to contract/r/gnoswap/v1/router/doc.gno
diff --git a/router/errors.gno b/contract/r/gnoswap/v1/router/errors.gno
similarity index 100%
rename from router/errors.gno
rename to contract/r/gnoswap/v1/router/errors.gno
diff --git a/router/exact_in.gno b/contract/r/gnoswap/v1/router/exact_in.gno
similarity index 100%
rename from router/exact_in.gno
rename to contract/r/gnoswap/v1/router/exact_in.gno
diff --git a/router/exact_in_test.gno b/contract/r/gnoswap/v1/router/exact_in_test.gno
similarity index 100%
rename from router/exact_in_test.gno
rename to contract/r/gnoswap/v1/router/exact_in_test.gno
diff --git a/router/exact_out.gno b/contract/r/gnoswap/v1/router/exact_out.gno
similarity index 100%
rename from router/exact_out.gno
rename to contract/r/gnoswap/v1/router/exact_out.gno
diff --git a/router/gno.mod b/contract/r/gnoswap/v1/router/gno.mod
similarity index 100%
rename from router/gno.mod
rename to contract/r/gnoswap/v1/router/gno.mod
diff --git a/router/protocol_fee_swap.gno b/contract/r/gnoswap/v1/router/protocol_fee_swap.gno
similarity index 100%
rename from router/protocol_fee_swap.gno
rename to contract/r/gnoswap/v1/router/protocol_fee_swap.gno
diff --git a/router/protocol_fee_swap_test.gno b/contract/r/gnoswap/v1/router/protocol_fee_swap_test.gno
similarity index 100%
rename from router/protocol_fee_swap_test.gno
rename to contract/r/gnoswap/v1/router/protocol_fee_swap_test.gno
diff --git a/router/router.gno b/contract/r/gnoswap/v1/router/router.gno
similarity index 100%
rename from router/router.gno
rename to contract/r/gnoswap/v1/router/router.gno
diff --git a/router/router_dry.gno b/contract/r/gnoswap/v1/router/router_dry.gno
similarity index 100%
rename from router/router_dry.gno
rename to contract/r/gnoswap/v1/router/router_dry.gno
diff --git a/router/router_dry_test.gno b/contract/r/gnoswap/v1/router/router_dry_test.gno
similarity index 100%
rename from router/router_dry_test.gno
rename to contract/r/gnoswap/v1/router/router_dry_test.gno
diff --git a/router/router_test.gno b/contract/r/gnoswap/v1/router/router_test.gno
similarity index 100%
rename from router/router_test.gno
rename to contract/r/gnoswap/v1/router/router_test.gno
diff --git a/router/swap_inner.gno b/contract/r/gnoswap/v1/router/swap_inner.gno
similarity index 100%
rename from router/swap_inner.gno
rename to contract/r/gnoswap/v1/router/swap_inner.gno
diff --git a/router/swap_inner_test.gno b/contract/r/gnoswap/v1/router/swap_inner_test.gno
similarity index 100%
rename from router/swap_inner_test.gno
rename to contract/r/gnoswap/v1/router/swap_inner_test.gno
diff --git a/router/swap_multi.gno b/contract/r/gnoswap/v1/router/swap_multi.gno
similarity index 100%
rename from router/swap_multi.gno
rename to contract/r/gnoswap/v1/router/swap_multi.gno
diff --git a/router/swap_multi_test.gno b/contract/r/gnoswap/v1/router/swap_multi_test.gno
similarity index 100%
rename from router/swap_multi_test.gno
rename to contract/r/gnoswap/v1/router/swap_multi_test.gno
diff --git a/router/swap_single.gno b/contract/r/gnoswap/v1/router/swap_single.gno
similarity index 100%
rename from router/swap_single.gno
rename to contract/r/gnoswap/v1/router/swap_single.gno
diff --git a/router/swap_single_test.gno b/contract/r/gnoswap/v1/router/swap_single_test.gno
similarity index 100%
rename from router/swap_single_test.gno
rename to contract/r/gnoswap/v1/router/swap_single_test.gno
diff --git a/router/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA
similarity index 100%
rename from router/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_TOKEN_REGISTER_test.gnoA
diff --git a/router/tests/__TEST_0_INIT_VARS_HELPERS_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_VARS_HELPERS_test.gnoA
similarity index 100%
rename from router/tests/__TEST_0_INIT_VARS_HELPERS_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_0_INIT_VARS_HELPERS_test.gnoA
diff --git a/router/tests/__TEST_router_all_2_route_2_hop_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_all_2_route_2_hop_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_test.gnoA
diff --git a/router/tests/__TEST_router_all_2_route_2_hop_with_emission_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_with_emission_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_all_2_route_2_hop_with_emission_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_all_2_route_2_hop_with_emission_test.gnoA
diff --git a/router/tests/__TEST_router_native_swap_amount_check_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_native_swap_amount_check_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_native_swap_amount_check_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_native_swap_amount_check_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#1_ExactIn_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#1_ExactIn_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#1_ExactIn_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#1_ExactIn_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#2_ExactIn_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#2_ExactIn_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#2_ExactIn_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#2_ExactIn_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#3_ExactIn_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#3_ExactIn_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#3_ExactIn_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#3_ExactIn_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#4_ExactIn_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#4_ExactIn_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#4_ExactIn_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#4_ExactIn_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#5_ExactOut_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#5_ExactOut_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#5_ExactOut_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#5_ExactOut_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#6_ExactOut_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#6_ExactOut_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#6_ExactOut_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#6_ExactOut_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#7_ExactOut_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#7_ExactOut_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#7_ExactOut_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#7_ExactOut_test.gnoA
diff --git a/router/tests/__TEST_router_spec_#8_ExactOut_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#8_ExactOut_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_spec_#8_ExactOut_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_spec_#8_ExactOut_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_1hop_out_range_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_out_range_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_1hop_out_range_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_out_range_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_1hop_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_1hop_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_1route_3hop_wrapped_native_middle_test.gnoA
diff --git a/router/tests/__TEST_router_swap_route_2route_2hop_test.gnoA b/contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_2route_2hop_test.gnoA
similarity index 100%
rename from router/tests/__TEST_router_swap_route_2route_2hop_test.gnoA
rename to contract/r/gnoswap/v1/router/tests/__TEST_router_swap_route_2route_2hop_test.gnoA
diff --git a/router/type.gno b/contract/r/gnoswap/v1/router/type.gno
similarity index 100%
rename from router/type.gno
rename to contract/r/gnoswap/v1/router/type.gno
diff --git a/router/type_test.gno b/contract/r/gnoswap/v1/router/type_test.gno
similarity index 100%
rename from router/type_test.gno
rename to contract/r/gnoswap/v1/router/type_test.gno
diff --git a/router/utils.gno b/contract/r/gnoswap/v1/router/utils.gno
similarity index 100%
rename from router/utils.gno
rename to contract/r/gnoswap/v1/router/utils.gno
diff --git a/router/utils_test.gno b/contract/r/gnoswap/v1/router/utils_test.gno
similarity index 100%
rename from router/utils_test.gno
rename to contract/r/gnoswap/v1/router/utils_test.gno
diff --git a/router/wrap_unwrap.gno b/contract/r/gnoswap/v1/router/wrap_unwrap.gno
similarity index 100%
rename from router/wrap_unwrap.gno
rename to contract/r/gnoswap/v1/router/wrap_unwrap.gno
diff --git a/staker/README.md b/contract/r/gnoswap/v1/staker/README.md
similarity index 100%
rename from staker/README.md
rename to contract/r/gnoswap/v1/staker/README.md
diff --git a/staker/__TEST_full_internal_external_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_full_internal_external_test.gnoA
similarity index 100%
rename from staker/__TEST_full_internal_external_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_full_internal_external_test.gnoA
diff --git a/staker/__TEST_more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA
similarity index 100%
rename from staker/__TEST_more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA
diff --git a/staker/__TEST_more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA
similarity index 100%
rename from staker/__TEST_more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA
diff --git a/staker/__TEST_more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA
similarity index 100%
rename from staker/__TEST_more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA
diff --git a/staker/__TEST_short_warmup_internal_gnot_gns_3000_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_short_warmup_internal_gnot_gns_3000_test.gnoA
similarity index 100%
rename from staker/__TEST_short_warmup_internal_gnot_gns_3000_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_short_warmup_internal_gnot_gns_3000_test.gnoA
diff --git a/staker/__TEST_staker_NFT_transfer_01_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_NFT_transfer_01_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_NFT_transfer_01_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_NFT_transfer_01_test.gnoA
diff --git a/staker/__TEST_staker_NFT_transfer_02_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_NFT_transfer_02_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_NFT_transfer_02_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_NFT_transfer_02_test.gnoA
diff --git a/staker/__TEST_staker_NFT_transfer_03_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_NFT_transfer_03_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_NFT_transfer_03_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_NFT_transfer_03_test.gnoA
diff --git a/staker/__TEST_staker_external_native_coin_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_external_native_coin_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_external_native_coin_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_external_native_coin_test.gnoA
diff --git a/staker/__TEST_staker_manage_pool_tiers_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_manage_pool_tiers_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_manage_pool_tiers_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_manage_pool_tiers_test.gnoA
diff --git a/staker/__TEST_staker_mint_and_stake_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_mint_and_stake_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_mint_and_stake_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_mint_and_stake_test.gnoA
diff --git a/staker/__TEST_staker_native_create_collect_unstake_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_native_create_collect_unstake_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_native_create_collect_unstake_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_native_create_collect_unstake_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_calculate_pool_position_reward_API_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_10_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_10_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_10_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_10_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_12_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_12_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_12_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_12_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_13_gns_external_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_13_gns_external_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_13_gns_external_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_13_gns_external_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_14_position_in_out_range_changed_by_swap_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_15_90d_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_15_90d_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_15_90d_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_15_90d_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_16_180d_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_16_180d_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_16_180d_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_16_180d_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_external_17_365d_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_17_365d_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_external_17_365d_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_external_17_365d_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_internal_01_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_01_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_internal_01_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_01_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_internal_02_small_liq_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_02_small_liq_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_internal_02_small_liq_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_02_small_liq_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_internal_03_change_tier_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_03_change_tier_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_internal_03_change_tier_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_03_change_tier_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_internal_04_remove_tier_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_04_remove_tier_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_internal_04_remove_tier_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_04_remove_tier_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA
diff --git a/staker/__TEST_staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA
similarity index 100%
rename from staker/__TEST_staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA
diff --git a/staker/__TEST_token_uri_in_same_block_test.gnoA b/contract/r/gnoswap/v1/staker/__TEST_token_uri_in_same_block_test.gnoA
similarity index 100%
rename from staker/__TEST_token_uri_in_same_block_test.gnoA
rename to contract/r/gnoswap/v1/staker/__TEST_token_uri_in_same_block_test.gnoA
diff --git a/staker/_helper_test.gno b/contract/r/gnoswap/v1/staker/_helper_test.gno
similarity index 100%
rename from staker/_helper_test.gno
rename to contract/r/gnoswap/v1/staker/_helper_test.gno
diff --git a/staker/api.gno b/contract/r/gnoswap/v1/staker/api.gno
similarity index 100%
rename from staker/api.gno
rename to contract/r/gnoswap/v1/staker/api.gno
diff --git a/staker/calculate_pool_position_reward.gno b/contract/r/gnoswap/v1/staker/calculate_pool_position_reward.gno
similarity index 100%
rename from staker/calculate_pool_position_reward.gno
rename to contract/r/gnoswap/v1/staker/calculate_pool_position_reward.gno
diff --git a/staker/callback.gno b/contract/r/gnoswap/v1/staker/callback.gno
similarity index 100%
rename from staker/callback.gno
rename to contract/r/gnoswap/v1/staker/callback.gno
diff --git a/staker/doc.gno b/contract/r/gnoswap/v1/staker/doc.gno
similarity index 100%
rename from staker/doc.gno
rename to contract/r/gnoswap/v1/staker/doc.gno
diff --git a/staker/errors.gno b/contract/r/gnoswap/v1/staker/errors.gno
similarity index 100%
rename from staker/errors.gno
rename to contract/r/gnoswap/v1/staker/errors.gno
diff --git a/staker/external_deposit_fee.gno b/contract/r/gnoswap/v1/staker/external_deposit_fee.gno
similarity index 100%
rename from staker/external_deposit_fee.gno
rename to contract/r/gnoswap/v1/staker/external_deposit_fee.gno
diff --git a/staker/external_deposit_fee_test.gno b/contract/r/gnoswap/v1/staker/external_deposit_fee_test.gno
similarity index 100%
rename from staker/external_deposit_fee_test.gno
rename to contract/r/gnoswap/v1/staker/external_deposit_fee_test.gno
diff --git a/staker/external_token_list.gno b/contract/r/gnoswap/v1/staker/external_token_list.gno
similarity index 100%
rename from staker/external_token_list.gno
rename to contract/r/gnoswap/v1/staker/external_token_list.gno
diff --git a/staker/external_token_list_test.gno b/contract/r/gnoswap/v1/staker/external_token_list_test.gno
similarity index 100%
rename from staker/external_token_list_test.gno
rename to contract/r/gnoswap/v1/staker/external_token_list_test.gno
diff --git a/staker/filetests/z_average_block_time_change_from_gns_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_average_block_time_change_from_gns_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_average_block_time_change_from_gns_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_average_block_time_change_from_gns_filetest.gnoA
diff --git a/staker/filetests/z_no_position_to_give_reward_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_no_position_to_give_reward_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_no_position_to_give_reward_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_no_position_to_give_reward_filetest.gnoA
diff --git a/staker/filetests/z_pool_add_to_tier2_and_change_to_tier3_internal_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_pool_add_to_tier2_and_change_to_tier3_internal_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_pool_add_to_tier2_and_change_to_tier3_internal_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_pool_add_to_tier2_and_change_to_tier3_internal_filetest.gnoA
diff --git a/staker/filetests/z_pool_add_to_tier2_and_removed_internal_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_pool_add_to_tier2_and_removed_internal_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_pool_add_to_tier2_and_removed_internal_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_pool_add_to_tier2_and_removed_internal_filetest.gnoA
diff --git a/staker/filetests/z_position_inrange_change_by_swap_external_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_position_inrange_change_by_swap_external_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_position_inrange_change_by_swap_external_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_position_inrange_change_by_swap_external_filetest.gnoA
diff --git a/staker/filetests/z_position_inrange_change_by_swap_internal_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_position_inrange_change_by_swap_internal_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_position_inrange_change_by_swap_internal_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_position_inrange_change_by_swap_internal_filetest.gnoA
diff --git a/staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_external_filetest.gnoXX_ApiGetReward_missing b/contract/r/gnoswap/v1/staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_external_filetest.gnoXX_ApiGetReward_missing
similarity index 100%
rename from staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_external_filetest.gnoXX_ApiGetReward_missing
rename to contract/r/gnoswap/v1/staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_external_filetest.gnoXX_ApiGetReward_missing
diff --git a/staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_internal_filetest.gnoXX_ApiGetReward_missing b/contract/r/gnoswap/v1/staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_internal_filetest.gnoXX_ApiGetReward_missing
similarity index 100%
rename from staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_internal_filetest.gnoXX_ApiGetReward_missing
rename to contract/r/gnoswap/v1/staker/filetests/z_reward_for_user_collect_change_by_collecting_reward_internal_filetest.gnoXX_ApiGetReward_missing
diff --git a/staker/filetests/z_single_gns_external_ends_filetest.gnXX_collecting_reward_at_sameblock_differnet_position b/contract/r/gnoswap/v1/staker/filetests/z_single_gns_external_ends_filetest.gnXX_collecting_reward_at_sameblock_differnet_position
similarity index 100%
rename from staker/filetests/z_single_gns_external_ends_filetest.gnXX_collecting_reward_at_sameblock_differnet_position
rename to contract/r/gnoswap/v1/staker/filetests/z_single_gns_external_ends_filetest.gnXX_collecting_reward_at_sameblock_differnet_position
diff --git a/staker/filetests/z_single_position_stake_unstake_restake_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_single_position_stake_unstake_restake_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_single_position_stake_unstake_restake_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_single_position_stake_unstake_restake_filetest.gnoA
diff --git a/staker/filetests/z_single_position_stake_unstake_same_block_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_single_position_stake_unstake_same_block_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_single_position_stake_unstake_same_block_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_single_position_stake_unstake_same_block_filetest.gnoA
diff --git a/staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gno b/contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gno
similarity index 100%
rename from staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gno
rename to contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gno
diff --git a/staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gnoXX_RewardZero b/contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gnoXX_RewardZero
similarity index 100%
rename from staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gnoXX_RewardZero
rename to contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_staking_external_filetest.gnoXX_RewardZero
diff --git a/staker/filetests/z_staked_liquidity_change_by_staking_internal_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_staking_internal_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_staked_liquidity_change_by_staking_internal_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_staking_internal_filetest.gnoA
diff --git a/staker/filetests/z_staked_liquidity_change_by_unstaking_external_filetest.gnoXXX_CollectReward_DiffPosition_SameHeight b/contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_unstaking_external_filetest.gnoXXX_CollectReward_DiffPosition_SameHeight
similarity index 100%
rename from staker/filetests/z_staked_liquidity_change_by_unstaking_external_filetest.gnoXXX_CollectReward_DiffPosition_SameHeight
rename to contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_unstaking_external_filetest.gnoXXX_CollectReward_DiffPosition_SameHeight
diff --git a/staker/filetests/z_staked_liquidity_change_by_unstaking_internal_filetest.gnoA b/contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_unstaking_internal_filetest.gnoA
similarity index 100%
rename from staker/filetests/z_staked_liquidity_change_by_unstaking_internal_filetest.gnoA
rename to contract/r/gnoswap/v1/staker/filetests/z_staked_liquidity_change_by_unstaking_internal_filetest.gnoA
diff --git a/staker/filetests/z_staker_internal_external_01_both_has_gns_filetest.gnoXX_ApiGetReward_missing b/contract/r/gnoswap/v1/staker/filetests/z_staker_internal_external_01_both_has_gns_filetest.gnoXX_ApiGetReward_missing
similarity index 100%
rename from staker/filetests/z_staker_internal_external_01_both_has_gns_filetest.gnoXX_ApiGetReward_missing
rename to contract/r/gnoswap/v1/staker/filetests/z_staker_internal_external_01_both_has_gns_filetest.gnoXX_ApiGetReward_missing
diff --git a/staker/filetests/z_staker_internal_external_02_position_range_change_filetest.gno b/contract/r/gnoswap/v1/staker/filetests/z_staker_internal_external_02_position_range_change_filetest.gno
similarity index 100%
rename from staker/filetests/z_staker_internal_external_02_position_range_change_filetest.gno
rename to contract/r/gnoswap/v1/staker/filetests/z_staker_internal_external_02_position_range_change_filetest.gno
diff --git a/staker/filetests/z_two_external_incentive_one_ends_external_filetest.gnoXX_RefundLeftExternalAmount b/contract/r/gnoswap/v1/staker/filetests/z_two_external_incentive_one_ends_external_filetest.gnoXX_RefundLeftExternalAmount
similarity index 100%
rename from staker/filetests/z_two_external_incentive_one_ends_external_filetest.gnoXX_RefundLeftExternalAmount
rename to contract/r/gnoswap/v1/staker/filetests/z_two_external_incentive_one_ends_external_filetest.gnoXX_RefundLeftExternalAmount
diff --git a/staker/getter.gno b/contract/r/gnoswap/v1/staker/getter.gno
similarity index 100%
rename from staker/getter.gno
rename to contract/r/gnoswap/v1/staker/getter.gno
diff --git a/staker/gno.mod b/contract/r/gnoswap/v1/staker/gno.mod
similarity index 100%
rename from staker/gno.mod
rename to contract/r/gnoswap/v1/staker/gno.mod
diff --git a/staker/incentive_id.gno b/contract/r/gnoswap/v1/staker/incentive_id.gno
similarity index 100%
rename from staker/incentive_id.gno
rename to contract/r/gnoswap/v1/staker/incentive_id.gno
diff --git a/staker/incentive_id_test.gno b/contract/r/gnoswap/v1/staker/incentive_id_test.gno
similarity index 100%
rename from staker/incentive_id_test.gno
rename to contract/r/gnoswap/v1/staker/incentive_id_test.gno
diff --git a/staker/manage_pool_tier_and_warmup.gno b/contract/r/gnoswap/v1/staker/manage_pool_tier_and_warmup.gno
similarity index 100%
rename from staker/manage_pool_tier_and_warmup.gno
rename to contract/r/gnoswap/v1/staker/manage_pool_tier_and_warmup.gno
diff --git a/staker/mint_stake.gno b/contract/r/gnoswap/v1/staker/mint_stake.gno
similarity index 100%
rename from staker/mint_stake.gno
rename to contract/r/gnoswap/v1/staker/mint_stake.gno
diff --git a/staker/protocol_fee_unstaking.gno b/contract/r/gnoswap/v1/staker/protocol_fee_unstaking.gno
similarity index 100%
rename from staker/protocol_fee_unstaking.gno
rename to contract/r/gnoswap/v1/staker/protocol_fee_unstaking.gno
diff --git a/staker/protocol_fee_unstaking_test.gno b/contract/r/gnoswap/v1/staker/protocol_fee_unstaking_test.gno
similarity index 100%
rename from staker/protocol_fee_unstaking_test.gno
rename to contract/r/gnoswap/v1/staker/protocol_fee_unstaking_test.gno
diff --git a/staker/query.gno b/contract/r/gnoswap/v1/staker/query.gno
similarity index 100%
rename from staker/query.gno
rename to contract/r/gnoswap/v1/staker/query.gno
diff --git a/staker/query_test.gno b/contract/r/gnoswap/v1/staker/query_test.gno
similarity index 100%
rename from staker/query_test.gno
rename to contract/r/gnoswap/v1/staker/query_test.gno
diff --git a/staker/reward_calculation.gno b/contract/r/gnoswap/v1/staker/reward_calculation.gno
similarity index 100%
rename from staker/reward_calculation.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation.gno
diff --git a/staker/reward_calculation_canonical_env_test.gno b/contract/r/gnoswap/v1/staker/reward_calculation_canonical_env_test.gno
similarity index 100%
rename from staker/reward_calculation_canonical_env_test.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_canonical_env_test.gno
diff --git a/staker/reward_calculation_canonical_test.gnoA b/contract/r/gnoswap/v1/staker/reward_calculation_canonical_test.gnoA
similarity index 100%
rename from staker/reward_calculation_canonical_test.gnoA
rename to contract/r/gnoswap/v1/staker/reward_calculation_canonical_test.gnoA
diff --git a/staker/reward_calculation_incentives.gno b/contract/r/gnoswap/v1/staker/reward_calculation_incentives.gno
similarity index 100%
rename from staker/reward_calculation_incentives.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_incentives.gno
diff --git a/staker/reward_calculation_pool.gno b/contract/r/gnoswap/v1/staker/reward_calculation_pool.gno
similarity index 100%
rename from staker/reward_calculation_pool.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_pool.gno
diff --git a/staker/reward_calculation_pool_tier.gno b/contract/r/gnoswap/v1/staker/reward_calculation_pool_tier.gno
similarity index 100%
rename from staker/reward_calculation_pool_tier.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_pool_tier.gno
diff --git a/staker/reward_calculation_pool_tier_test.gno b/contract/r/gnoswap/v1/staker/reward_calculation_pool_tier_test.gno
similarity index 100%
rename from staker/reward_calculation_pool_tier_test.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_pool_tier_test.gno
diff --git a/staker/reward_calculation_tick.gno b/contract/r/gnoswap/v1/staker/reward_calculation_tick.gno
similarity index 100%
rename from staker/reward_calculation_tick.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_tick.gno
diff --git a/staker/reward_calculation_tick_test.gno b/contract/r/gnoswap/v1/staker/reward_calculation_tick_test.gno
similarity index 100%
rename from staker/reward_calculation_tick_test.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_tick_test.gno
diff --git a/staker/reward_calculation_types.gno b/contract/r/gnoswap/v1/staker/reward_calculation_types.gno
similarity index 100%
rename from staker/reward_calculation_types.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_types.gno
diff --git a/staker/reward_calculation_types_test.gno b/contract/r/gnoswap/v1/staker/reward_calculation_types_test.gno
similarity index 100%
rename from staker/reward_calculation_types_test.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_types_test.gno
diff --git a/staker/reward_calculation_warmup.gno b/contract/r/gnoswap/v1/staker/reward_calculation_warmup.gno
similarity index 100%
rename from staker/reward_calculation_warmup.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_warmup.gno
diff --git a/staker/reward_calculation_warmup_test.gno b/contract/r/gnoswap/v1/staker/reward_calculation_warmup_test.gno
similarity index 100%
rename from staker/reward_calculation_warmup_test.gno
rename to contract/r/gnoswap/v1/staker/reward_calculation_warmup_test.gno
diff --git a/staker/reward_pool_store.gno b/contract/r/gnoswap/v1/staker/reward_pool_store.gno
similarity index 100%
rename from staker/reward_pool_store.gno
rename to contract/r/gnoswap/v1/staker/reward_pool_store.gno
diff --git a/staker/reward_pool_store_test.gno b/contract/r/gnoswap/v1/staker/reward_pool_store_test.gno
similarity index 100%
rename from staker/reward_pool_store_test.gno
rename to contract/r/gnoswap/v1/staker/reward_pool_store_test.gno
diff --git a/staker/staker.gno b/contract/r/gnoswap/v1/staker/staker.gno
similarity index 100%
rename from staker/staker.gno
rename to contract/r/gnoswap/v1/staker/staker.gno
diff --git a/staker/staker_external_incentive.gno b/contract/r/gnoswap/v1/staker/staker_external_incentive.gno
similarity index 100%
rename from staker/staker_external_incentive.gno
rename to contract/r/gnoswap/v1/staker/staker_external_incentive.gno
diff --git a/staker/type.gno b/contract/r/gnoswap/v1/staker/type.gno
similarity index 100%
rename from staker/type.gno
rename to contract/r/gnoswap/v1/staker/type.gno
diff --git a/staker/utils.gno b/contract/r/gnoswap/v1/staker/utils.gno
similarity index 100%
rename from staker/utils.gno
rename to contract/r/gnoswap/v1/staker/utils.gno
diff --git a/staker/utils_test.gno b/contract/r/gnoswap/v1/staker/utils_test.gno
similarity index 100%
rename from staker/utils_test.gno
rename to contract/r/gnoswap/v1/staker/utils_test.gno
diff --git a/staker/warp_unwrap_test.gno b/contract/r/gnoswap/v1/staker/warp_unwrap_test.gno
similarity index 100%
rename from staker/warp_unwrap_test.gno
rename to contract/r/gnoswap/v1/staker/warp_unwrap_test.gno
diff --git a/staker/wrap_unwrap.gno b/contract/r/gnoswap/v1/staker/wrap_unwrap.gno
similarity index 100%
rename from staker/wrap_unwrap.gno
rename to contract/r/gnoswap/v1/staker/wrap_unwrap.gno
diff --git a/__local/grc20_tokens/onbloc/bar/bar.gno b/contract/r/onbloc/bar/bar.gno
similarity index 100%
rename from __local/grc20_tokens/onbloc/bar/bar.gno
rename to contract/r/onbloc/bar/bar.gno
diff --git a/__local/grc20_tokens/onbloc/bar/gno.mod b/contract/r/onbloc/bar/gno.mod
similarity index 100%
rename from __local/grc20_tokens/onbloc/bar/gno.mod
rename to contract/r/onbloc/bar/gno.mod
diff --git a/__local/grc20_tokens/onbloc/baz/baz.gno b/contract/r/onbloc/baz/baz.gno
similarity index 100%
rename from __local/grc20_tokens/onbloc/baz/baz.gno
rename to contract/r/onbloc/baz/baz.gno
diff --git a/__local/grc20_tokens/onbloc/baz/gno.mod b/contract/r/onbloc/baz/gno.mod
similarity index 100%
rename from __local/grc20_tokens/onbloc/baz/gno.mod
rename to contract/r/onbloc/baz/gno.mod
diff --git a/__local/grc20_tokens/onbloc/foo/foo.gno b/contract/r/onbloc/foo/foo.gno
similarity index 100%
rename from __local/grc20_tokens/onbloc/foo/foo.gno
rename to contract/r/onbloc/foo/foo.gno
diff --git a/__local/grc20_tokens/onbloc/foo/gno.mod b/contract/r/onbloc/foo/gno.mod
similarity index 100%
rename from __local/grc20_tokens/onbloc/foo/gno.mod
rename to contract/r/onbloc/foo/gno.mod
diff --git a/__local/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod b/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod
similarity index 100%
rename from __local/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod
rename to contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod
diff --git a/__local/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno b/contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno
similarity index 100%
rename from __local/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno
rename to contract/r/onbloc/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/register_gnodev.gno
diff --git a/__local/grc20_tokens/onbloc/obl/gno.mod b/contract/r/onbloc/obl/gno.mod
similarity index 100%
rename from __local/grc20_tokens/onbloc/obl/gno.mod
rename to contract/r/onbloc/obl/gno.mod
diff --git a/__local/grc20_tokens/onbloc/obl/obl.gno b/contract/r/onbloc/obl/obl.gno
similarity index 100%
rename from __local/grc20_tokens/onbloc/obl/obl.gno
rename to contract/r/onbloc/obl/obl.gno
diff --git a/__local/grc20_tokens/onbloc/qux/gno.mod b/contract/r/onbloc/qux/gno.mod
similarity index 100%
rename from __local/grc20_tokens/onbloc/qux/gno.mod
rename to contract/r/onbloc/qux/gno.mod
diff --git a/__local/grc20_tokens/onbloc/qux/qux.gno b/contract/r/onbloc/qux/qux.gno
similarity index 100%
rename from __local/grc20_tokens/onbloc/qux/qux.gno
rename to contract/r/onbloc/qux/qux.gno
diff --git a/__local/grc20_tokens/onbloc/usdc/gno.mod b/contract/r/onbloc/usdc/gno.mod
similarity index 100%
rename from __local/grc20_tokens/onbloc/usdc/gno.mod
rename to contract/r/onbloc/usdc/gno.mod
diff --git a/__local/grc20_tokens/onbloc/usdc/usdc.gno b/contract/r/onbloc/usdc/usdc.gno
similarity index 100%
rename from __local/grc20_tokens/onbloc/usdc/usdc.gno
rename to contract/r/onbloc/usdc/usdc.gno
diff --git a/__local/test/all_test_data.mk b/tests/all_test_data.mk
similarity index 100%
rename from __local/test/all_test_data.mk
rename to tests/all_test_data.mk
diff --git a/__local/test/emission_test.mk b/tests/emission_test.mk
similarity index 100%
rename from __local/test/emission_test.mk
rename to tests/emission_test.mk
diff --git a/__local/test/gov_proposal.mk b/tests/gov_proposal.mk
similarity index 100%
rename from __local/test/gov_proposal.mk
rename to tests/gov_proposal.mk
diff --git a/__local/grc20_tokens/grc20reg/approve_transferfrom.txtar b/tests/grc20reg/approve_transferfrom.txtar
similarity index 100%
rename from __local/grc20_tokens/grc20reg/approve_transferfrom.txtar
rename to tests/grc20reg/approve_transferfrom.txtar
diff --git a/__local/test/launchpad_test.mk b/tests/launchpad_test.mk
similarity index 100%
rename from __local/test/launchpad_test.mk
rename to tests/launchpad_test.mk