diff --git a/apps/payment/app_test.go b/apps/payment/app_test.go
index 5590252e..4c82a08d 100644
--- a/apps/payment/app_test.go
+++ b/apps/payment/app_test.go
@@ -22,8 +22,8 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestApp_Def(t *testing.T) {
diff --git a/apps/payment/randomizer_test.go b/apps/payment/randomizer_test.go
index 266be174..580208e5 100644
--- a/apps/payment/randomizer_test.go
+++ b/apps/payment/randomizer_test.go
@@ -21,7 +21,7 @@ import (
 
 	_ "perun.network/go-perun/backend/sim" // backend init
 	"perun.network/go-perun/channel"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestRandomizer(t *testing.T) {
diff --git a/apps/payment/resolver_test.go b/apps/payment/resolver_test.go
index cdccb686..58fc3c6a 100644
--- a/apps/payment/resolver_test.go
+++ b/apps/payment/resolver_test.go
@@ -22,8 +22,8 @@ import (
 
 	_ "perun.network/go-perun/backend/sim" // backend init
 	"perun.network/go-perun/channel"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestResolver(t *testing.T) {
diff --git a/backend/ethereum/channel/adjudicator.go b/backend/ethereum/channel/adjudicator.go
index 1ea2f6e2..2dfdd7f7 100644
--- a/backend/ethereum/channel/adjudicator.go
+++ b/backend/ethereum/channel/adjudicator.go
@@ -30,7 +30,7 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
 	"perun.network/go-perun/log"
-	psync "perun.network/go-perun/pkg/sync"
+	psync "polycry.pt/poly-go/sync"
 )
 
 // compile time check that we implement the perun adjudicator interface.
diff --git a/backend/ethereum/channel/adjudicator_internal_test.go b/backend/ethereum/channel/adjudicator_internal_test.go
index 02e43f16..21200a88 100644
--- a/backend/ethereum/channel/adjudicator_internal_test.go
+++ b/backend/ethereum/channel/adjudicator_internal_test.go
@@ -22,7 +22,7 @@ import (
 	"perun.network/go-perun/backend/ethereum/bindings/adjudicator"
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func Test_toEthSubStates(t *testing.T) {
diff --git a/backend/ethereum/channel/adjudicator_test.go b/backend/ethereum/channel/adjudicator_test.go
index a758682a..6f545502 100644
--- a/backend/ethereum/channel/adjudicator_test.go
+++ b/backend/ethereum/channel/adjudicator_test.go
@@ -30,7 +30,7 @@ import (
 	ethwallettest "perun.network/go-perun/backend/ethereum/wallet/test"
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 const defaultTxTimeout = 2 * time.Second
diff --git a/backend/ethereum/channel/asset_test.go b/backend/ethereum/channel/asset_test.go
index 55d3b6d1..4df6fcc3 100644
--- a/backend/ethereum/channel/asset_test.go
+++ b/backend/ethereum/channel/asset_test.go
@@ -26,7 +26,7 @@ import (
 	ethchannel "perun.network/go-perun/backend/ethereum/channel"
 	"perun.network/go-perun/backend/ethereum/channel/test"
 	ethwallettest "perun.network/go-perun/backend/ethereum/wallet/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestValidateAssetHolderETH(t *testing.T) {
diff --git a/backend/ethereum/channel/backend_test.go b/backend/ethereum/channel/backend_test.go
index 34502f7a..00f6876e 100644
--- a/backend/ethereum/channel/backend_test.go
+++ b/backend/ethereum/channel/backend_test.go
@@ -30,10 +30,10 @@ import (
 	ethchanneltest "perun.network/go-perun/backend/ethereum/channel/test"
 	ethwallettest "perun.network/go-perun/backend/ethereum/wallet/test"
 	"perun.network/go-perun/channel/test"
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	perunwallet "perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAdjudicator_PureFunctions(t *testing.T) {
diff --git a/backend/ethereum/channel/conclude_test.go b/backend/ethereum/channel/conclude_test.go
index 594c8e68..e75d2186 100644
--- a/backend/ethereum/channel/conclude_test.go
+++ b/backend/ethereum/channel/conclude_test.go
@@ -27,9 +27,9 @@ import (
 	"perun.network/go-perun/backend/ethereum/wallet/keystore"
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	"perun.network/go-perun/pkg/errors"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/errors"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAdjudicator_ConcludeFinal(t *testing.T) {
diff --git a/backend/ethereum/channel/contractbackend.go b/backend/ethereum/channel/contractbackend.go
index 5410c96b..6406a520 100644
--- a/backend/ethereum/channel/contractbackend.go
+++ b/backend/ethereum/channel/contractbackend.go
@@ -30,7 +30,7 @@ import (
 
 	cherrors "perun.network/go-perun/backend/ethereum/channel/errors"
 	"perun.network/go-perun/log"
-	pcontext "perun.network/go-perun/pkg/context"
+	pcontext "polycry.pt/poly-go/context"
 )
 
 // How many blocks we query into the past for events.
diff --git a/backend/ethereum/channel/contractbackend_test.go b/backend/ethereum/channel/contractbackend_test.go
index 4cdae3d7..44d8a667 100644
--- a/backend/ethereum/channel/contractbackend_test.go
+++ b/backend/ethereum/channel/contractbackend_test.go
@@ -28,8 +28,8 @@ import (
 	ethchannel "perun.network/go-perun/backend/ethereum/channel"
 	"perun.network/go-perun/backend/ethereum/channel/test"
 	ethwallet "perun.network/go-perun/backend/ethereum/wallet"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func fromEthAddr(a common.Address) wallet.Address {
diff --git a/backend/ethereum/channel/deploy.go b/backend/ethereum/channel/deploy.go
index 4cdd3a35..f533f2ef 100644
--- a/backend/ethereum/channel/deploy.go
+++ b/backend/ethereum/channel/deploy.go
@@ -33,7 +33,7 @@ import (
 	cherrors "perun.network/go-perun/backend/ethereum/channel/errors"
 	"perun.network/go-perun/client"
 	"perun.network/go-perun/log"
-	pcontext "perun.network/go-perun/pkg/context"
+	pcontext "polycry.pt/poly-go/context"
 )
 
 const deployGasLimit = 6600000
diff --git a/backend/ethereum/channel/deploy_test.go b/backend/ethereum/channel/deploy_test.go
index 0f7cd9b2..5fa95578 100644
--- a/backend/ethereum/channel/deploy_test.go
+++ b/backend/ethereum/channel/deploy_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	ethchannel "perun.network/go-perun/backend/ethereum/channel"
 	"perun.network/go-perun/backend/ethereum/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestDeployReorgResistance(t *testing.T) {
diff --git a/backend/ethereum/channel/funder.go b/backend/ethereum/channel/funder.go
index f6855541..11ab4c4d 100644
--- a/backend/ethereum/channel/funder.go
+++ b/backend/ethereum/channel/funder.go
@@ -34,9 +34,9 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
 	"perun.network/go-perun/log"
-	pcontext "perun.network/go-perun/pkg/context"
-	perror "perun.network/go-perun/pkg/errors"
 	perunwallet "perun.network/go-perun/wallet"
+	pcontext "polycry.pt/poly-go/context"
+	perror "polycry.pt/poly-go/errors"
 )
 
 type assetHolder struct {
diff --git a/backend/ethereum/channel/funder_test.go b/backend/ethereum/channel/funder_test.go
index 5b088bdd..95ed7047 100644
--- a/backend/ethereum/channel/funder_test.go
+++ b/backend/ethereum/channel/funder_test.go
@@ -37,9 +37,9 @@ import (
 	"perun.network/go-perun/backend/ethereum/wallet/keystore"
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 const (
diff --git a/backend/ethereum/channel/register_test.go b/backend/ethereum/channel/register_test.go
index fe0b2586..7c134a11 100644
--- a/backend/ethereum/channel/register_test.go
+++ b/backend/ethereum/channel/register_test.go
@@ -28,7 +28,7 @@ import (
 	"perun.network/go-perun/backend/ethereum/channel/test"
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAdjudicator_MultipleRegisters(t *testing.T) {
diff --git a/backend/ethereum/channel/reorg_test.go b/backend/ethereum/channel/reorg_test.go
index d5446941..b1370ab2 100644
--- a/backend/ethereum/channel/reorg_test.go
+++ b/backend/ethereum/channel/reorg_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"perun.network/go-perun/backend/ethereum/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // sendTXsBlockLen describes how many blocks the function `sendTXs` will create.
diff --git a/backend/ethereum/channel/test/simulated.go b/backend/ethereum/channel/test/simulated.go
index 173cbc22..5cda208a 100644
--- a/backend/ethereum/channel/test/simulated.go
+++ b/backend/ethereum/channel/test/simulated.go
@@ -32,7 +32,7 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync"
+	"polycry.pt/poly-go/sync"
 )
 
 const (
diff --git a/backend/ethereum/channel/test/simulated_test.go b/backend/ethereum/channel/test/simulated_test.go
index c7ef90fc..1cd47ba3 100644
--- a/backend/ethereum/channel/test/simulated_test.go
+++ b/backend/ethereum/channel/test/simulated_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"perun.network/go-perun/backend/ethereum/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // TestSimBackend_AutoMine tests that SimulatedBackend mines blocks after
diff --git a/backend/ethereum/channel/withdraw_test.go b/backend/ethereum/channel/withdraw_test.go
index e75276c5..46456c12 100644
--- a/backend/ethereum/channel/withdraw_test.go
+++ b/backend/ethereum/channel/withdraw_test.go
@@ -29,7 +29,7 @@ import (
 	ethwallet "perun.network/go-perun/backend/ethereum/wallet"
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAdjudicator_MultipleWithdraws_FinalState(t *testing.T) {
diff --git a/backend/ethereum/client/dispute_test.go b/backend/ethereum/client/dispute_test.go
index 617f66a4..c8b031f6 100644
--- a/backend/ethereum/client/dispute_test.go
+++ b/backend/ethereum/client/dispute_test.go
@@ -30,8 +30,8 @@ import (
 	"perun.network/go-perun/client"
 	clienttest "perun.network/go-perun/client/test"
 	"perun.network/go-perun/log"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 const twoPartyTestTimeout = 10 * time.Second
diff --git a/backend/ethereum/client/happy_test.go b/backend/ethereum/client/happy_test.go
index 37645ce1..65df08c5 100644
--- a/backend/ethereum/client/happy_test.go
+++ b/backend/ethereum/client/happy_test.go
@@ -31,8 +31,8 @@ import (
 	perunclient "perun.network/go-perun/client"
 	clienttest "perun.network/go-perun/client/test"
 	"perun.network/go-perun/log"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestHappyAliceBob(t *testing.T) {
diff --git a/backend/ethereum/client/progression_test.go b/backend/ethereum/client/progression_test.go
index 54c04811..ea6205cd 100644
--- a/backend/ethereum/client/progression_test.go
+++ b/backend/ethereum/client/progression_test.go
@@ -28,9 +28,9 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
 	clienttest "perun.network/go-perun/client/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestProgression(t *testing.T) {
diff --git a/backend/ethereum/subscription/eventsub.go b/backend/ethereum/subscription/eventsub.go
index e777b1b2..ee013ee1 100644
--- a/backend/ethereum/subscription/eventsub.go
+++ b/backend/ethereum/subscription/eventsub.go
@@ -25,7 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	cherrors "perun.network/go-perun/backend/ethereum/channel/errors"
 	"perun.network/go-perun/log"
-	pkgsync "perun.network/go-perun/pkg/sync"
+	pkgsync "polycry.pt/poly-go/sync"
 )
 
 type (
diff --git a/backend/ethereum/subscription/eventsub_test.go b/backend/ethereum/subscription/eventsub_test.go
index fa3a2970..ec8ecfb1 100644
--- a/backend/ethereum/subscription/eventsub_test.go
+++ b/backend/ethereum/subscription/eventsub_test.go
@@ -35,8 +35,8 @@ import (
 	"perun.network/go-perun/backend/ethereum/wallet/keystore"
 	channeltest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/log"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 const (
diff --git a/backend/ethereum/subscription/resistanteventsub.go b/backend/ethereum/subscription/resistanteventsub.go
index 5f8ebfa0..00bebbd0 100644
--- a/backend/ethereum/subscription/resistanteventsub.go
+++ b/backend/ethereum/subscription/resistanteventsub.go
@@ -26,7 +26,7 @@ import (
 
 	cherrors "perun.network/go-perun/backend/ethereum/channel/errors"
 	"perun.network/go-perun/log"
-	pkgsync "perun.network/go-perun/pkg/sync"
+	pkgsync "polycry.pt/poly-go/sync"
 )
 
 type (
diff --git a/backend/ethereum/subscription/resistanteventsub_test.go b/backend/ethereum/subscription/resistanteventsub_test.go
index ec9f8d45..4bfdcd3c 100644
--- a/backend/ethereum/subscription/resistanteventsub_test.go
+++ b/backend/ethereum/subscription/resistanteventsub_test.go
@@ -26,8 +26,8 @@ import (
 	"perun.network/go-perun/backend/ethereum/channel/test"
 	"perun.network/go-perun/backend/ethereum/subscription"
 	"perun.network/go-perun/log"
-	pctx "perun.network/go-perun/pkg/context"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pctx "polycry.pt/poly-go/context"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 var event = func() *subscription.Event {
diff --git a/backend/ethereum/wallet/address_test.go b/backend/ethereum/wallet/address_test.go
index 7d5ff7ae..176fdc93 100644
--- a/backend/ethereum/wallet/address_test.go
+++ b/backend/ethereum/wallet/address_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAsWalletAddr(t *testing.T) {
diff --git a/backend/ethereum/wallet/backend.go b/backend/ethereum/wallet/backend.go
index 2caa9e86..7816b8da 100644
--- a/backend/ethereum/wallet/backend.go
+++ b/backend/ethereum/wallet/backend.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/crypto"
 
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // Backend implements the utility interface defined in the wallet package.
diff --git a/backend/ethereum/wallet/hd/transactor_test.go b/backend/ethereum/wallet/hd/transactor_test.go
index b7d0cdf7..ed33b29b 100644
--- a/backend/ethereum/wallet/hd/transactor_test.go
+++ b/backend/ethereum/wallet/hd/transactor_test.go
@@ -28,7 +28,7 @@ import (
 	"perun.network/go-perun/backend/ethereum/channel/test"
 	"perun.network/go-perun/backend/ethereum/wallet"
 	"perun.network/go-perun/backend/ethereum/wallet/hd"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // missingAddr is the address for which key will not be contained in the wallet.
diff --git a/backend/ethereum/wallet/hd/wallet_test.go b/backend/ethereum/wallet/hd/wallet_test.go
index 4280a450..8317eda4 100644
--- a/backend/ethereum/wallet/hd/wallet_test.go
+++ b/backend/ethereum/wallet/hd/wallet_test.go
@@ -27,8 +27,8 @@ import (
 
 	ethwallet "perun.network/go-perun/backend/ethereum/wallet"
 	"perun.network/go-perun/backend/ethereum/wallet/hd"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 var dataToSign = []byte("SomeLongDataThatShouldBeSignedPlease")
diff --git a/backend/ethereum/wallet/keystore/transactor_test.go b/backend/ethereum/wallet/keystore/transactor_test.go
index e59eeeba..3d52ddb1 100644
--- a/backend/ethereum/wallet/keystore/transactor_test.go
+++ b/backend/ethereum/wallet/keystore/transactor_test.go
@@ -28,8 +28,8 @@ import (
 	"perun.network/go-perun/backend/ethereum/wallet"
 	"perun.network/go-perun/backend/ethereum/wallet/keystore"
 	_ "perun.network/go-perun/backend/ethereum/wallet/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // Random address for which key will not be contained in the wallet.
diff --git a/backend/ethereum/wallet/keystore/wallet_test.go b/backend/ethereum/wallet/keystore/wallet_test.go
index 4e72bf8f..33f16594 100644
--- a/backend/ethereum/wallet/keystore/wallet_test.go
+++ b/backend/ethereum/wallet/keystore/wallet_test.go
@@ -25,8 +25,8 @@ import (
 
 	ethwallet "perun.network/go-perun/backend/ethereum/wallet"
 	ethwallettest "perun.network/go-perun/backend/ethereum/wallet/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 var dataToSign = []byte("SomeLongDataThatShouldBeSignedPlease")
diff --git a/backend/ethereum/wallet/simple/transactor_test.go b/backend/ethereum/wallet/simple/transactor_test.go
index b3ea3f12..e53fc084 100644
--- a/backend/ethereum/wallet/simple/transactor_test.go
+++ b/backend/ethereum/wallet/simple/transactor_test.go
@@ -27,7 +27,7 @@ import (
 	"perun.network/go-perun/backend/ethereum/channel/test"
 	"perun.network/go-perun/backend/ethereum/wallet"
 	"perun.network/go-perun/backend/ethereum/wallet/simple"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // Missing address for which key will not be contained in the wallet.
diff --git a/backend/ethereum/wallet/simple/wallet_test.go b/backend/ethereum/wallet/simple/wallet_test.go
index 9d29a4c1..7edd9d11 100644
--- a/backend/ethereum/wallet/simple/wallet_test.go
+++ b/backend/ethereum/wallet/simple/wallet_test.go
@@ -28,8 +28,8 @@ import (
 
 	ethwallet "perun.network/go-perun/backend/ethereum/wallet"
 	"perun.network/go-perun/backend/ethereum/wallet/simple"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 var dataToSign = []byte("SomeLongDataThatShouldBeSignedPlease")
diff --git a/backend/sim/channel/asset.go b/backend/sim/channel/asset.go
index 776d6759..78b24970 100644
--- a/backend/sim/channel/asset.go
+++ b/backend/sim/channel/asset.go
@@ -19,7 +19,7 @@ import (
 	"math/rand"
 
 	"perun.network/go-perun/channel"
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // Asset simulates a `channel.Asset` by only containing an `ID`.
diff --git a/backend/sim/channel/backend.go b/backend/sim/channel/backend.go
index 4a002998..99452f3f 100644
--- a/backend/sim/channel/backend.go
+++ b/backend/sim/channel/backend.go
@@ -23,8 +23,8 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // backend implements the utility interface defined in the channel package.
diff --git a/backend/sim/channel/channel_test.go b/backend/sim/channel/channel_test.go
index 301bd2b4..2435d1db 100644
--- a/backend/sim/channel/channel_test.go
+++ b/backend/sim/channel/channel_test.go
@@ -18,9 +18,9 @@ import (
 	"testing"
 
 	chtest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wtest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestGenericTests(t *testing.T) {
diff --git a/backend/sim/wallet/account.go b/backend/sim/wallet/account.go
index 7f53e6ad..90592dc2 100644
--- a/backend/sim/wallet/account.go
+++ b/backend/sim/wallet/account.go
@@ -23,8 +23,8 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync/atomic"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/sync/atomic"
 )
 
 // Account represents a mocked account.
diff --git a/backend/sim/wallet/address.go b/backend/sim/wallet/address.go
index d06b7bde..220d9291 100644
--- a/backend/sim/wallet/address.go
+++ b/backend/sim/wallet/address.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // Address represents a simulated address.
diff --git a/backend/sim/wallet/address_test.go b/backend/sim/wallet/address_test.go
index 1655fa59..03996d69 100644
--- a/backend/sim/wallet/address_test.go
+++ b/backend/sim/wallet/address_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestAddress_ByteArray(t *testing.T) {
diff --git a/backend/sim/wallet/backend.go b/backend/sim/wallet/backend.go
index 63df2b09..15364e6e 100644
--- a/backend/sim/wallet/backend.go
+++ b/backend/sim/wallet/backend.go
@@ -23,8 +23,8 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 var curve = elliptic.P256()
diff --git a/backend/sim/wallet/wallet_internal_test.go b/backend/sim/wallet/wallet_internal_test.go
index d0b8f713..fe907187 100644
--- a/backend/sim/wallet/wallet_internal_test.go
+++ b/backend/sim/wallet/wallet_internal_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // TestSignatureSerialize tests serializeSignature and deserializeSignature since
diff --git a/backend/sim/wallet/wallet_test.go b/backend/sim/wallet/wallet_test.go
index abe2a5ad..1f1989b0 100644
--- a/backend/sim/wallet/wallet_test.go
+++ b/backend/sim/wallet/wallet_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"perun.network/go-perun/backend/sim/wallet"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestWallet_AddAccount(t *testing.T) {
diff --git a/channel/allocation.go b/channel/allocation.go
index 81b1db26..f72b476f 100644
--- a/channel/allocation.go
+++ b/channel/allocation.go
@@ -19,8 +19,8 @@ import (
 	"log"
 	"math/big"
 
-	perunio "perun.network/go-perun/pkg/io"
-	perunbig "perun.network/go-perun/pkg/math/big"
+	perunio "polycry.pt/poly-go/io"
+	perunbig "polycry.pt/poly-go/math/big"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/pkg/errors"
diff --git a/channel/allocation_test.go b/channel/allocation_test.go
index daaff48f..16ee3f09 100644
--- a/channel/allocation_test.go
+++ b/channel/allocation_test.go
@@ -24,10 +24,10 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	perunio "perun.network/go-perun/pkg/io"
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgbig "perun.network/go-perun/pkg/math/big"
-	pkgtest "perun.network/go-perun/pkg/test"
+	perunio "polycry.pt/poly-go/io"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgbig "polycry.pt/poly-go/math/big"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAllocationNumParts(t *testing.T) {
diff --git a/channel/app.go b/channel/app.go
index 6dfa9b02..e30272cf 100644
--- a/channel/app.go
+++ b/channel/app.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 type (
diff --git a/channel/app_test.go b/channel/app_test.go
index f8764c91..65c59326 100644
--- a/channel/app_test.go
+++ b/channel/app_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAppShouldEqual(t *testing.T) {
diff --git a/channel/appregistry_internal_test.go b/channel/appregistry_internal_test.go
index fe3280d9..5084793f 100644
--- a/channel/appregistry_internal_test.go
+++ b/channel/appregistry_internal_test.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wtest "perun.network/go-perun/wallet/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestAppRegistry(t *testing.T) {
diff --git a/channel/machine.go b/channel/machine.go
index 2e645ec8..30211757 100644
--- a/channel/machine.go
+++ b/channel/machine.go
@@ -21,9 +21,9 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/io"
-	"perun.network/go-perun/pkg/math/big"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/io"
+	"polycry.pt/poly-go/math/big"
 )
 
 // Index is the type for the number of participants, assets, sub-allocations, actions and alike.
diff --git a/channel/machine_test.go b/channel/machine_test.go
index 5b5dce59..f381163c 100644
--- a/channel/machine_test.go
+++ b/channel/machine_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestMachineClone(t *testing.T) {
diff --git a/channel/mock_app.go b/channel/mock_app.go
index 2f3cb3ab..86b83551 100644
--- a/channel/mock_app.go
+++ b/channel/mock_app.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // MockApp a mocked App whose behaviour is determined by the MockOp passed to it either as State.Data or Action.
diff --git a/channel/mock_app_internal_test.go b/channel/mock_app_internal_test.go
index 45693e0c..b7efd4a7 100644
--- a/channel/mock_app_internal_test.go
+++ b/channel/mock_app_internal_test.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestMockApp(t *testing.T) {
diff --git a/channel/params.go b/channel/params.go
index a0047673..fb5fc1da 100644
--- a/channel/params.go
+++ b/channel/params.go
@@ -22,8 +22,8 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/io"
 )
 
 // IDLen the length of a channelID.
diff --git a/channel/params_test.go b/channel/params_test.go
index cf0a5123..9f62d5f2 100644
--- a/channel/params_test.go
+++ b/channel/params_test.go
@@ -19,9 +19,9 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	"perun.network/go-perun/pkg/io"
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/io"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestParams_Clone(t *testing.T) {
diff --git a/channel/persistence/keyvalue/persistedstate.go b/channel/persistence/keyvalue/persistedstate.go
index 41fcdf03..130f03c8 100644
--- a/channel/persistence/keyvalue/persistedstate.go
+++ b/channel/persistence/keyvalue/persistedstate.go
@@ -18,7 +18,7 @@ import (
 	"io"
 
 	"perun.network/go-perun/channel"
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 var _ perunio.Encoder = PersistedState{}
diff --git a/channel/persistence/keyvalue/persister.go b/channel/persistence/keyvalue/persister.go
index 0250f344..08c74680 100644
--- a/channel/persistence/keyvalue/persister.go
+++ b/channel/persistence/keyvalue/persister.go
@@ -26,9 +26,9 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/channel"
-	perunio "perun.network/go-perun/pkg/io"
-	"perun.network/go-perun/pkg/sortedkv"
 	"perun.network/go-perun/wire"
+	perunio "polycry.pt/poly-go/io"
+	"polycry.pt/poly-go/sortedkv"
 )
 
 // ChannelCreated inserts a channel into the database.
diff --git a/channel/persistence/keyvalue/persistrestorer.go b/channel/persistence/keyvalue/persistrestorer.go
index db328c36..9e2b94be 100644
--- a/channel/persistence/keyvalue/persistrestorer.go
+++ b/channel/persistence/keyvalue/persistrestorer.go
@@ -16,7 +16,7 @@ package keyvalue
 
 import (
 	"perun.network/go-perun/channel/persistence"
-	"perun.network/go-perun/pkg/sortedkv"
+	"polycry.pt/poly-go/sortedkv"
 )
 
 var _ persistence.PersistRestorer = (*PersistRestorer)(nil)
diff --git a/channel/persistence/keyvalue/persistrestorer_test.go b/channel/persistence/keyvalue/persistrestorer_test.go
index 4e19b631..478924f5 100644
--- a/channel/persistence/keyvalue/persistrestorer_test.go
+++ b/channel/persistence/keyvalue/persistrestorer_test.go
@@ -24,10 +24,10 @@ import (
 
 	_ "perun.network/go-perun/backend/sim"
 	"perun.network/go-perun/channel/persistence/test"
-	"perun.network/go-perun/pkg/sortedkv"
-	"perun.network/go-perun/pkg/sortedkv/leveldb"
-	"perun.network/go-perun/pkg/sortedkv/memorydb"
-	pkgtest "perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/sortedkv"
+	"polycry.pt/poly-go/sortedkv/leveldb"
+	"polycry.pt/poly-go/sortedkv/memorydb"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestPersistRestorer_Generic(t *testing.T) {
diff --git a/channel/persistence/keyvalue/restorer.go b/channel/persistence/keyvalue/restorer.go
index 7a37d546..480b3203 100644
--- a/channel/persistence/keyvalue/restorer.go
+++ b/channel/persistence/keyvalue/restorer.go
@@ -24,10 +24,10 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/persistence"
-	perunio "perun.network/go-perun/pkg/io"
-	"perun.network/go-perun/pkg/sortedkv"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	perunio "polycry.pt/poly-go/io"
+	"polycry.pt/poly-go/sortedkv"
 )
 
 var _ persistence.ChannelIterator = (*ChannelIterator)(nil)
diff --git a/channel/persistence/statemachine_test.go b/channel/persistence/statemachine_test.go
index b8b88317..9ba4822d 100644
--- a/channel/persistence/statemachine_test.go
+++ b/channel/persistence/statemachine_test.go
@@ -23,8 +23,8 @@ import (
 	"perun.network/go-perun/channel/persistence"
 	"perun.network/go-perun/channel/persistence/test"
 	ctest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // TestStateMachine tests the StateMachine embedding by advancing the
diff --git a/channel/persistence/test/channel_test.go b/channel/persistence/test/channel_test.go
index fabe24e8..4fe0b81a 100644
--- a/channel/persistence/test/channel_test.go
+++ b/channel/persistence/test/channel_test.go
@@ -18,8 +18,8 @@ import (
 	"math/rand"
 	"testing"
 
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/test"
 )
 
 func TestRequireEqualSigsTX(t *testing.T) {
diff --git a/channel/persistence/test/peerchans_test.go b/channel/persistence/test/peerchans_test.go
index d3d6ed4d..67aac72d 100644
--- a/channel/persistence/test/peerchans_test.go
+++ b/channel/persistence/test/peerchans_test.go
@@ -21,9 +21,9 @@ import (
 
 	"perun.network/go-perun/channel"
 	ctest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestEndpointChans(t *testing.T) {
diff --git a/channel/persistence/test/persistrestorer_test.go b/channel/persistence/test/persistrestorer_test.go
index fb46f617..f5a8cc6a 100644
--- a/channel/persistence/test/persistrestorer_test.go
+++ b/channel/persistence/test/persistrestorer_test.go
@@ -20,7 +20,7 @@ import (
 
 	_ "perun.network/go-perun/backend/sim" // backend init
 	"perun.network/go-perun/channel/persistence/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestPersistRestorer_Generic(t *testing.T) {
diff --git a/channel/persistence/test/persistrestorertest.go b/channel/persistence/test/persistrestorertest.go
index c8049b2e..9418fa38 100644
--- a/channel/persistence/test/persistrestorertest.go
+++ b/channel/persistence/test/persistrestorertest.go
@@ -25,9 +25,9 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/persistence"
 	"perun.network/go-perun/log"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // Client is a mock client that can be used to create channels.
diff --git a/channel/state.go b/channel/state.go
index a94cc27e..898f7578 100644
--- a/channel/state.go
+++ b/channel/state.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 type (
diff --git a/channel/state_test.go b/channel/state_test.go
index d9be74c0..84fb50c5 100644
--- a/channel/state_test.go
+++ b/channel/state_test.go
@@ -20,8 +20,8 @@ import (
 	_ "perun.network/go-perun/backend/sim" // backend init
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestStateSerialization(t *testing.T) {
diff --git a/channel/test/app_randomizer_test.go b/channel/test/app_randomizer_test.go
index 40f77d1f..64d7b9bb 100644
--- a/channel/test/app_randomizer_test.go
+++ b/channel/test/app_randomizer_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestAppRandomizerSet(t *testing.T) {
diff --git a/channel/transaction.go b/channel/transaction.go
index 2e679053..ff3ed646 100644
--- a/channel/transaction.go
+++ b/channel/transaction.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // Transaction is a channel state together with valid signatures from the
diff --git a/channel/transaction_test.go b/channel/transaction_test.go
index d4013c49..2623c6d3 100644
--- a/channel/transaction_test.go
+++ b/channel/transaction_test.go
@@ -19,8 +19,8 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgtest "perun.network/go-perun/pkg/test"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestTransactionSerialization(t *testing.T) {
diff --git a/client/adjudicate.go b/client/adjudicate.go
index ef89adab..7e6eaad3 100644
--- a/client/adjudicate.go
+++ b/client/adjudicate.go
@@ -21,9 +21,9 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/watcher"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
 )
 
 // AdjudicatorEventHandler represents an interface for handling adjudicator events.
diff --git a/client/channel.go b/client/channel.go
index 274f50af..f206f330 100644
--- a/client/channel.go
+++ b/client/channel.go
@@ -22,10 +22,10 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/persistence"
 	"perun.network/go-perun/log"
-	perunsync "perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/watcher"
 	"perun.network/go-perun/wire"
+	perunsync "polycry.pt/poly-go/sync"
 )
 
 // Channel is the channel controller, progressing the channel state machine and
diff --git a/client/channelconn.go b/client/channelconn.go
index b7fce3df..bc70cca8 100644
--- a/client/channelconn.go
+++ b/client/channelconn.go
@@ -22,8 +22,8 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
 )
 
 // A channelConn bundles the message sending and receiving infrastructure for a
diff --git a/client/chanregistry.go b/client/chanregistry.go
index 604bd9dc..ac7910ee 100644
--- a/client/chanregistry.go
+++ b/client/chanregistry.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 
 	"perun.network/go-perun/channel"
-	psync "perun.network/go-perun/pkg/sync"
+	psync "polycry.pt/poly-go/sync"
 )
 
 // chanRegistry is a registry for channels.
diff --git a/client/chanregistry_test.go b/client/chanregistry_test.go
index 08e12f42..79156723 100644
--- a/client/chanregistry_test.go
+++ b/client/chanregistry_test.go
@@ -21,8 +21,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func testCh() *Channel {
diff --git a/client/client.go b/client/client.go
index 8902797d..e7ee22dd 100644
--- a/client/client.go
+++ b/client/client.go
@@ -23,10 +23,10 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/persistence"
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/watcher"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
 )
 
 // Client is a state channel client. It is the central controller to interact
diff --git a/client/client_internal_test.go b/client/client_internal_test.go
index 886083a0..a38ef04a 100644
--- a/client/client_internal_test.go
+++ b/client/client_internal_test.go
@@ -20,8 +20,8 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	channeltest "perun.network/go-perun/channel/test"
-	"perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestClient_Channel(t *testing.T) {
diff --git a/client/client_role_test.go b/client/client_role_test.go
index 773a9162..a974c2f4 100644
--- a/client/client_role_test.go
+++ b/client/client_role_test.go
@@ -27,11 +27,11 @@ import (
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"
-	"perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/watcher/local"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	"polycry.pt/poly-go/test"
 )
 
 const (
diff --git a/client/client_test.go b/client/client_test.go
index b0e23314..e0610f5d 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -25,10 +25,10 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"
-	"perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/watcher/local"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/test"
 )
 
 type DummyBus struct {
diff --git a/client/dispute_test.go b/client/dispute_test.go
index 14285a39..8a90eb66 100644
--- a/client/dispute_test.go
+++ b/client/dispute_test.go
@@ -23,8 +23,8 @@ import (
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestDispute(t *testing.T) {
diff --git a/client/proposal.go b/client/proposal.go
index 8fe6a64a..d406b56c 100644
--- a/client/proposal.go
+++ b/client/proposal.go
@@ -24,11 +24,11 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	pcontext "perun.network/go-perun/pkg/context"
-	"perun.network/go-perun/pkg/io"
-	"perun.network/go-perun/pkg/sync/atomic"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	pcontext "polycry.pt/poly-go/context"
+	"polycry.pt/poly-go/io"
+	"polycry.pt/poly-go/sync/atomic"
 )
 
 const proposerIdx, proposeeIdx = 0, 1
diff --git a/client/proposal_internal_test.go b/client/proposal_internal_test.go
index 0bb51d86..f69f389b 100644
--- a/client/proposal_internal_test.go
+++ b/client/proposal_internal_test.go
@@ -22,11 +22,11 @@ import (
 
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestClient_validTwoPartyProposal(t *testing.T) {
diff --git a/client/proposalmsgs.go b/client/proposalmsgs.go
index 75cd5bc0..c536b3ca 100644
--- a/client/proposalmsgs.go
+++ b/client/proposalmsgs.go
@@ -24,10 +24,10 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	perunio "perun.network/go-perun/pkg/io"
-	perunbig "perun.network/go-perun/pkg/math/big"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	perunio "polycry.pt/poly-go/io"
+	perunbig "polycry.pt/poly-go/math/big"
 )
 
 func init() {
diff --git a/client/proposalmsgs_test.go b/client/proposalmsgs_test.go
index 2a2d3e8b..7ebd321d 100644
--- a/client/proposalmsgs_test.go
+++ b/client/proposalmsgs_test.go
@@ -24,9 +24,9 @@ import (
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	clienttest "perun.network/go-perun/client/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestNewLedgerChannelProposal(t *testing.T) {
diff --git a/client/proposalopts_test.go b/client/proposalopts_test.go
index ae78782d..e4829518 100644
--- a/client/proposalopts_test.go
+++ b/client/proposalopts_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestProposalOpts_isNonce(t *testing.T) {
diff --git a/client/restore_test.go b/client/restore_test.go
index 8a3c97c9..a0fbb832 100644
--- a/client/restore_test.go
+++ b/client/restore_test.go
@@ -25,11 +25,11 @@ import (
 	"perun.network/go-perun/channel/persistence"
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func patchChFromSource(
diff --git a/client/serialize.go b/client/serialize.go
index 11246591..9c039c80 100644
--- a/client/serialize.go
+++ b/client/serialize.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pkg/errors"
 	"perun.network/go-perun/channel"
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 type (
diff --git a/client/subchannel_dispute_test.go b/client/subchannel_dispute_test.go
index e386a373..e63fa9e6 100644
--- a/client/subchannel_dispute_test.go
+++ b/client/subchannel_dispute_test.go
@@ -23,8 +23,8 @@ import (
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/test"
 )
 
 func TestSubChannelDispute(t *testing.T) {
diff --git a/client/subchannel_happy_test.go b/client/subchannel_happy_test.go
index eb8ee345..b9e51c39 100644
--- a/client/subchannel_happy_test.go
+++ b/client/subchannel_happy_test.go
@@ -24,8 +24,8 @@ import (
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/test"
 )
 
 func TestSubChannelHappy(t *testing.T) {
diff --git a/client/syncmsgs.go b/client/syncmsgs.go
index 4e585413..5def0e8f 100644
--- a/client/syncmsgs.go
+++ b/client/syncmsgs.go
@@ -18,8 +18,8 @@ import (
 	"io"
 
 	"perun.network/go-perun/channel"
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wire"
+	perunio "polycry.pt/poly-go/io"
 )
 
 func init() {
diff --git a/client/test/backend.go b/client/test/backend.go
index 15c5603c..d911eb7a 100644
--- a/client/test/backend.go
+++ b/client/test/backend.go
@@ -25,8 +25,8 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/io"
 )
 
 type (
diff --git a/client/test/doc.go b/client/test/doc.go
index 4478952f..684393a1 100644
--- a/client/test/doc.go
+++ b/client/test/doc.go
@@ -13,4 +13,4 @@
 // limitations under the License.
 
 // Package test contains testing setup types and functions for package client.
-package test // import "perun.network/go-perun/pkg/test"
+package test // import "perun.network/go-perun/client/test"
diff --git a/client/test/persistence.go b/client/test/persistence.go
index 419cc1be..6154d056 100644
--- a/client/test/persistence.go
+++ b/client/test/persistence.go
@@ -24,7 +24,7 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 type (
diff --git a/client/test/proposer.go b/client/test/proposer.go
index 2404617c..92d92930 100644
--- a/client/test/proposer.go
+++ b/client/test/proposer.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // Proposer is a test client role. He proposes the new channel.
diff --git a/client/test/responder.go b/client/test/responder.go
index 6b567429..046a85ff 100644
--- a/client/test/responder.go
+++ b/client/test/responder.go
@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // Responder is a test client role. He accepts an incoming channel proposal.
diff --git a/client/test/role.go b/client/test/role.go
index c4c149b3..c1e2ac33 100644
--- a/client/test/role.go
+++ b/client/test/role.go
@@ -29,11 +29,11 @@ import (
 	"perun.network/go-perun/channel/persistence"
 	"perun.network/go-perun/client"
 	"perun.network/go-perun/log"
-	pkgsync "perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/watcher"
 	"perun.network/go-perun/wire"
+	pkgsync "polycry.pt/poly-go/sync"
 )
 
 type (
diff --git a/client/test/subchannel.go b/client/test/subchannel.go
index cf402844..229d63a6 100644
--- a/client/test/subchannel.go
+++ b/client/test/subchannel.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"perun.network/go-perun/client"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 // SusieTimExecConfig contains config parameters for Susie and Tim test.
diff --git a/client/test/subchannel_dispute.go b/client/test/subchannel_dispute.go
index 3d719e74..360c786e 100644
--- a/client/test/subchannel_dispute.go
+++ b/client/test/subchannel_dispute.go
@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
-	pkgtest "perun.network/go-perun/pkg/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 const nStagesDisputeSusieTime = 4
diff --git a/client/update.go b/client/update.go
index f5f83071..6e7f083f 100644
--- a/client/update.go
+++ b/client/update.go
@@ -21,10 +21,10 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/log"
-	pcontext "perun.network/go-perun/pkg/context"
-	"perun.network/go-perun/pkg/sync/atomic"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	pcontext "polycry.pt/poly-go/context"
+	"polycry.pt/poly-go/sync/atomic"
 )
 
 // handleChannelUpdate forwards incoming channel update requests to the
diff --git a/client/updatemsgs.go b/client/updatemsgs.go
index 82b39828..d9f4b687 100644
--- a/client/updatemsgs.go
+++ b/client/updatemsgs.go
@@ -18,9 +18,9 @@ import (
 	"io"
 
 	"perun.network/go-perun/channel"
-	perunio "perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	perunio "polycry.pt/poly-go/io"
 )
 
 func init() {
diff --git a/client/updatemsgs_test.go b/client/updatemsgs_test.go
index b37d1904..c1753795 100644
--- a/client/updatemsgs_test.go
+++ b/client/updatemsgs_test.go
@@ -20,10 +20,10 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestChannelUpdateSerialization(t *testing.T) {
diff --git a/client/virtual_channel_test.go b/client/virtual_channel_test.go
index f65eb3aa..0791a680 100644
--- a/client/virtual_channel_test.go
+++ b/client/virtual_channel_test.go
@@ -28,9 +28,9 @@ import (
 	chtest "perun.network/go-perun/channel/test"
 	"perun.network/go-perun/client"
 	ctest "perun.network/go-perun/client/test"
-	"perun.network/go-perun/pkg/sync"
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
+	"polycry.pt/poly-go/test"
 )
 
 const challengeDuration = 10
diff --git a/log/log_test.go b/log/log_test.go
index 3409e06b..c1361e91 100644
--- a/log/log_test.go
+++ b/log/log_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 // none2 is a wrapper around none to have a different Logger type from none for
diff --git a/log/logrus/logrus_test.go b/log/logrus/logrus_test.go
index 04b3d67e..e9588442 100644
--- a/log/logrus/logrus_test.go
+++ b/log/logrus/logrus_test.go
@@ -26,8 +26,8 @@ import (
 
 	_ "perun.network/go-perun/backend/sim" // backend init
 	"perun.network/go-perun/log"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestLogrus(t *testing.T) {
diff --git a/log/none_test.go b/log/none_test.go
index 4a6bcd87..48d2fac9 100644
--- a/log/none_test.go
+++ b/log/none_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 // TestNone tests the none logger for coverage :).
diff --git a/wallet/address.go b/wallet/address.go
index 91ffa244..c8da1aa4 100644
--- a/wallet/address.go
+++ b/wallet/address.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/io"
+	"polycry.pt/poly-go/io"
 )
 
 // Address represents a identifier used in a cryptocurrency.
diff --git a/wallet/address_test.go b/wallet/address_test.go
index 0b6557fe..1c57f607 100644
--- a/wallet/address_test.go
+++ b/wallet/address_test.go
@@ -21,10 +21,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	_ "perun.network/go-perun/backend/sim/wallet"
-	iotest "perun.network/go-perun/pkg/io/test"
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
+	iotest "polycry.pt/poly-go/io/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 type testAddresses struct {
diff --git a/wallet/sig.go b/wallet/sig.go
index 77524cf2..5ebff4f0 100644
--- a/wallet/sig.go
+++ b/wallet/sig.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 // Sig is a single signature.
diff --git a/wallet/test/wallet.go b/wallet/test/wallet.go
index 14de689b..58539099 100644
--- a/wallet/test/wallet.go
+++ b/wallet/test/wallet.go
@@ -21,8 +21,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/io"
 )
 
 // InitWallet initializes a wallet.
diff --git a/watcher/local/watcher_test.go b/watcher/local/watcher_test.go
index c1dec605..278b95ed 100644
--- a/watcher/local/watcher_test.go
+++ b/watcher/local/watcher_test.go
@@ -31,10 +31,10 @@ import (
 	_ "perun.network/go-perun/backend/ethereum/channel/test" // For initilizing channeltest
 	"perun.network/go-perun/channel"
 	channeltest "perun.network/go-perun/channel/test"
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/watcher"
 	"perun.network/go-perun/watcher/internal/mock"
 	"perun.network/go-perun/watcher/local"
+	"polycry.pt/poly-go/test"
 )
 
 func Test_StartWatching(t *testing.T) {
diff --git a/wire/account_test.go b/wire/account_test.go
index defd4c6f..49989a0b 100644
--- a/wire/account_test.go
+++ b/wire/account_test.go
@@ -18,8 +18,8 @@ import (
 	"testing"
 
 	_ "perun.network/go-perun/backend/ethereum/wallet/test" // random init
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAuthResponseMsg(t *testing.T) {
diff --git a/wire/address.go b/wire/address.go
index 9a40692b..20b6384f 100644
--- a/wire/address.go
+++ b/wire/address.go
@@ -17,8 +17,8 @@ package wire
 import (
 	stdio "io"
 
-	"perun.network/go-perun/pkg/io"
 	"perun.network/go-perun/wallet"
+	"polycry.pt/poly-go/io"
 )
 
 var _ io.Serializer = (*Addresses)(nil)
diff --git a/wire/cache_internal_test.go b/wire/cache_internal_test.go
index 46bdf7d2..2d8861a5 100644
--- a/wire/cache_internal_test.go
+++ b/wire/cache_internal_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"perun.network/go-perun/pkg/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestCache(t *testing.T) {
diff --git a/wire/consumer.go b/wire/consumer.go
index 079d6c2f..2bfdb426 100644
--- a/wire/consumer.go
+++ b/wire/consumer.go
@@ -15,7 +15,7 @@
 package wire
 
 import (
-	"perun.network/go-perun/pkg/sync"
+	"polycry.pt/poly-go/sync"
 )
 
 // Consumer consumes messages fed into it via Put().
diff --git a/wire/controlmsgs.go b/wire/controlmsgs.go
index a88874de..7db5cc96 100644
--- a/wire/controlmsgs.go
+++ b/wire/controlmsgs.go
@@ -18,7 +18,7 @@ import (
 	"io"
 	"time"
 
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 func init() {
diff --git a/wire/msg.go b/wire/msg.go
index 12f0b785..4b37987a 100644
--- a/wire/msg.go
+++ b/wire/msg.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	perunio "perun.network/go-perun/pkg/io"
+	perunio "polycry.pt/poly-go/io"
 )
 
 type (
diff --git a/wire/msg_test.go b/wire/msg_test.go
index 622df543..c20ce361 100644
--- a/wire/msg_test.go
+++ b/wire/msg_test.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	iotest "perun.network/go-perun/pkg/io/test"
-	"perun.network/go-perun/pkg/test"
 	wtest "perun.network/go-perun/wallet/test"
+	iotest "polycry.pt/poly-go/io/test"
+	"polycry.pt/poly-go/test"
 )
 
 // NewRandomEnvelope - copy from wire/test for internal tests.
diff --git a/wire/msgtest.go b/wire/msgtest.go
index ab75256a..212c6d10 100644
--- a/wire/msgtest.go
+++ b/wire/msgtest.go
@@ -18,7 +18,7 @@ import (
 	"io"
 	"testing"
 
-	"perun.network/go-perun/pkg/io/test"
+	"polycry.pt/poly-go/io/test"
 )
 
 type serializerMsg struct {
diff --git a/wire/net/endpoint.go b/wire/net/endpoint.go
index d9da0788..e41ce457 100644
--- a/wire/net/endpoint.go
+++ b/wire/net/endpoint.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
 )
 
 // Endpoint is an authenticated connection to a Perun node.
diff --git a/wire/net/endpoint_registry.go b/wire/net/endpoint_registry.go
index 6e89c63e..b8705424 100644
--- a/wire/net/endpoint_registry.go
+++ b/wire/net/endpoint_registry.go
@@ -24,9 +24,9 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	perunsync "perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	perunsync "polycry.pt/poly-go/sync"
 )
 
 // dialingEndpoint is an endpoint that is being dialed, but has no connection
diff --git a/wire/net/endpoint_registry_external_test.go b/wire/net/endpoint_registry_external_test.go
index f6a98394..a5324706 100644
--- a/wire/net/endpoint_registry_external_test.go
+++ b/wire/net/endpoint_registry_external_test.go
@@ -22,13 +22,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/sync"
-	"perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
 	"perun.network/go-perun/wire/net"
 	nettest "perun.network/go-perun/wire/net/test"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/sync"
+	"polycry.pt/poly-go/test"
 )
 
 var timeout = 100 * time.Millisecond
diff --git a/wire/net/endpoint_registry_test.go b/wire/net/endpoint_registry_test.go
index 1d9da55d..40d0e3a7 100644
--- a/wire/net/endpoint_registry_test.go
+++ b/wire/net/endpoint_registry_test.go
@@ -25,13 +25,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/sync/atomic"
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/sync/atomic"
+	"polycry.pt/poly-go/test"
 )
 
 var _ Dialer = (*mockDialer)(nil)
diff --git a/wire/net/endpoint_test.go b/wire/net/endpoint_test.go
index 34c1465a..283ea848 100644
--- a/wire/net/endpoint_test.go
+++ b/wire/net/endpoint_test.go
@@ -25,10 +25,10 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	_ "perun.network/go-perun/backend/sim" // backend init
-	"perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	"polycry.pt/poly-go/test"
 )
 
 // setup is a test setup consisting of two connected peers.
diff --git a/wire/net/exchange_addr.go b/wire/net/exchange_addr.go
index 92ae052d..d7f3c0e9 100644
--- a/wire/net/exchange_addr.go
+++ b/wire/net/exchange_addr.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	pkg "perun.network/go-perun/pkg/context"
 	"perun.network/go-perun/wire"
+	pkg "polycry.pt/poly-go/context"
 )
 
 // AuthenticationError describes an error which occures when the ExchangeAddrs
diff --git a/wire/net/exchange_addr_test.go b/wire/net/exchange_addr_test.go
index 6c00a9e2..5567eb2d 100644
--- a/wire/net/exchange_addr_test.go
+++ b/wire/net/exchange_addr_test.go
@@ -21,11 +21,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestExchangeAddrs_ConnFail(t *testing.T) {
diff --git a/wire/net/ioconn.go b/wire/net/ioconn.go
index 3b4f3544..1b5b3d26 100644
--- a/wire/net/ioconn.go
+++ b/wire/net/ioconn.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync/atomic"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync/atomic"
 )
 
 var _ Conn = (*ioConn)(nil)
diff --git a/wire/net/mockconn_test.go b/wire/net/mockconn_test.go
index 5ad4dd41..ae550b59 100644
--- a/wire/net/mockconn_test.go
+++ b/wire/net/mockconn_test.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync/atomic"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync/atomic"
 )
 
 var _ Conn = (*MockConn)(nil)
diff --git a/wire/net/simple/dialer.go b/wire/net/simple/dialer.go
index 539fcbf1..6a7d30d7 100644
--- a/wire/net/simple/dialer.go
+++ b/wire/net/simple/dialer.go
@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	pkgsync "perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
 	wirenet "perun.network/go-perun/wire/net"
+	pkgsync "polycry.pt/poly-go/sync"
 )
 
 // Dialer is a simple lookup-table based dialer that can dial known peers.
diff --git a/wire/net/simple/dialer_test.go b/wire/net/simple/dialer_test.go
index 436f32ed..e23da3f3 100644
--- a/wire/net/simple/dialer_test.go
+++ b/wire/net/simple/dialer_test.go
@@ -23,10 +23,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	simwallet "perun.network/go-perun/backend/sim/wallet"
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet"
 	"perun.network/go-perun/wire"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/test"
 )
 
 func TestNewTCPDialer(t *testing.T) {
diff --git a/wire/net/simple/listener_test.go b/wire/net/simple/listener_test.go
index 183b54f7..51ee70dd 100644
--- a/wire/net/simple/listener_test.go
+++ b/wire/net/simple/listener_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"perun.network/go-perun/pkg/context/test"
+	"polycry.pt/poly-go/context/test"
 )
 
 const addr = "0.0.0.0:1337"
diff --git a/wire/net/test/connhub.go b/wire/net/test/connhub.go
index 6b9f8d10..85a457fa 100644
--- a/wire/net/test/connhub.go
+++ b/wire/net/test/connhub.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/sync"
 )
 
 // ConnHub is a factory for creating and connecting test dialers and listeners.
diff --git a/wire/net/test/connhub_test.go b/wire/net/test/connhub_test.go
index 19c96c9e..0b6945b4 100644
--- a/wire/net/test/connhub_test.go
+++ b/wire/net/test/connhub_test.go
@@ -22,12 +22,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	_ "perun.network/go-perun/backend/sim" // backend init
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/sync"
-	pkgtest "perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
 	wiretest "perun.network/go-perun/wire/test"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/sync"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestConnHub_Create(t *testing.T) {
diff --git a/wire/net/test/dialer.go b/wire/net/test/dialer.go
index e53dd7d1..08e27b20 100644
--- a/wire/net/test/dialer.go
+++ b/wire/net/test/dialer.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync"
 	"perun.network/go-perun/wire"
 	wirenet "perun.network/go-perun/wire/net"
+	"polycry.pt/poly-go/sync"
 )
 
 // Dialer is a test dialer that can dial connections to Listeners via a ConnHub.
diff --git a/wire/net/test/dialer_test.go b/wire/net/test/dialer_test.go
index a2bbcaf4..dcce7179 100644
--- a/wire/net/test/dialer_test.go
+++ b/wire/net/test/dialer_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestDialer_Dial(t *testing.T) {
diff --git a/wire/net/test/listener.go b/wire/net/test/listener.go
index 731cbc1a..87387e3d 100644
--- a/wire/net/test/listener.go
+++ b/wire/net/test/listener.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync"
 	wirenet "perun.network/go-perun/wire/net"
+	"polycry.pt/poly-go/sync"
 )
 
 var _ wirenet.Listener = &Listener{}
diff --git a/wire/net/test/listener_test.go b/wire/net/test/listener_test.go
index 91eb6cd5..d2d990f4 100644
--- a/wire/net/test/listener_test.go
+++ b/wire/net/test/listener_test.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	ctxtest "perun.network/go-perun/pkg/context/test"
 	"perun.network/go-perun/wire"
 	wirenet "perun.network/go-perun/wire/net"
+	ctxtest "polycry.pt/poly-go/context/test"
 )
 
 type fakeConn struct{}
diff --git a/wire/net/test/listenermap_test.go b/wire/net/test/listenermap_test.go
index f81ebb12..6024da4b 100644
--- a/wire/net/test/listenermap_test.go
+++ b/wire/net/test/listenermap_test.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	pkgtest "perun.network/go-perun/pkg/test"
 	"perun.network/go-perun/wallet/test"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestListenerMap_find(t *testing.T) {
diff --git a/wire/net/test/pipeconn.go b/wire/net/test/pipeconn.go
index ec4f6af2..2eaf74c1 100644
--- a/wire/net/test/pipeconn.go
+++ b/wire/net/test/pipeconn.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync/atomic"
 	"perun.network/go-perun/wire"
 	wirenet "perun.network/go-perun/wire/net"
+	"polycry.pt/poly-go/sync/atomic"
 )
 
 // Conn is a testing connection.
diff --git a/wire/receiver.go b/wire/receiver.go
index 5f59e3fb..1f4b6af7 100644
--- a/wire/receiver.go
+++ b/wire/receiver.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"perun.network/go-perun/pkg/sync"
+	"polycry.pt/poly-go/sync"
 )
 
 const (
diff --git a/wire/receiver_test.go b/wire/receiver_test.go
index 55173562..788a279c 100644
--- a/wire/receiver_test.go
+++ b/wire/receiver_test.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/test"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/test"
 )
 
 // timeout controls how long to wait until we decide that something will never
diff --git a/wire/relay.go b/wire/relay.go
index b90e91c1..8911b959 100644
--- a/wire/relay.go
+++ b/wire/relay.go
@@ -21,7 +21,7 @@ import (
 	"github.com/pkg/errors"
 
 	"perun.network/go-perun/log"
-	"perun.network/go-perun/pkg/sync"
+	"polycry.pt/poly-go/sync"
 )
 
 // Relay handles (un)registering Consumers for a message Relay's messages.
diff --git a/wire/relay_test.go b/wire/relay_test.go
index 409fd3ee..5e5f2eac 100644
--- a/wire/relay_test.go
+++ b/wire/relay_test.go
@@ -23,10 +23,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	ctxtest "perun.network/go-perun/pkg/context/test"
-	"perun.network/go-perun/pkg/sync"
-	"perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
+	ctxtest "polycry.pt/poly-go/context/test"
+	"polycry.pt/poly-go/sync"
+	"polycry.pt/poly-go/test"
 )
 
 func TestProducer(t *testing.T) {
diff --git a/wire/test/bustest.go b/wire/test/bustest.go
index 192cd0d7..828608dd 100644
--- a/wire/test/bustest.go
+++ b/wire/test/bustest.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"perun.network/go-perun/pkg/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
+	"polycry.pt/poly-go/test"
 )
 
 // GenericBusTest tests the general functionality of a bus in the happy case: it