diff --git a/services/wallet/activity/service.go b/services/wallet/activity/service.go
index 90df1b0ba..6c0c110a6 100644
--- a/services/wallet/activity/service.go
+++ b/services/wallet/activity/service.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
 
+	"github.com/status-im/status-go/services/wallet/async"
 	w_common "github.com/status-im/status-go/services/wallet/common"
 	"github.com/status-im/status-go/services/wallet/token"
 	"github.com/status-im/status-go/services/wallet/walletevent"
@@ -23,17 +24,17 @@ const (
 )
 
 var (
-	filterTask = TaskType{
+	filterTask = async.TaskType{
 		ID:     1,
-		Policy: ReplacementPolicyCancelOld,
+		Policy: async.ReplacementPolicyCancelOld,
 	}
-	getRecipientsTask = TaskType{
+	getRecipientsTask = async.TaskType{
 		ID:     2,
-		Policy: ReplacementPolicyIgnoreNew,
+		Policy: async.ReplacementPolicyIgnoreNew,
 	}
-	getOldestTimestampTask = TaskType{
+	getOldestTimestampTask = async.TaskType{
 		ID:     3,
-		Policy: ReplacementPolicyCancelOld,
+		Policy: async.ReplacementPolicyCancelOld,
 	}
 )
 
@@ -42,7 +43,7 @@ type Service struct {
 	tokenManager *token.Manager
 	eventFeed    *event.Feed
 
-	scheduler *Scheduler
+	scheduler *async.Scheduler
 }
 
 func NewService(db *sql.DB, tokenManager *token.Manager, eventFeed *event.Feed) *Service {
@@ -50,7 +51,7 @@ func NewService(db *sql.DB, tokenManager *token.Manager, eventFeed *event.Feed)
 		db:           db,
 		tokenManager: tokenManager,
 		eventFeed:    eventFeed,
-		scheduler:    NewScheduler(),
+		scheduler:    async.NewScheduler(),
 	}
 }
 
@@ -78,12 +79,12 @@ func (s *Service) FilterActivityAsync(ctx context.Context, addresses []common.Ad
 	s.scheduler.Enqueue(filterTask, func(ctx context.Context) (interface{}, error) {
 		activities, err := getActivityEntries(ctx, s.getDeps(), addresses, chainIDs, filter, offset, limit)
 		return activities, err
-	}, func(result interface{}, taskType TaskType, err error) {
+	}, func(result interface{}, taskType async.TaskType, err error) {
 		res := FilterResponse{
 			ErrorCode: ErrorCodeFailed,
 		}
 
-		if errors.Is(err, context.Canceled) || errors.Is(err, ErrTaskOverwritten) {
+		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
 		} else if err == nil {
 			activities := result.([]Entry)
@@ -118,9 +119,9 @@ func (s *Service) GetRecipientsAsync(ctx context.Context, offset int, limit int)
 		}
 		result.Addresses, result.HasMore, err = GetRecipients(ctx, s.db, offset, limit)
 		return result, err
-	}, func(result interface{}, taskType TaskType, err error) {
+	}, func(result interface{}, taskType async.TaskType, err error) {
 		res := result.(*GetRecipientsResponse)
-		if errors.Is(err, context.Canceled) || errors.Is(err, ErrTaskOverwritten) {
+		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
 		} else if err != nil {
 			res.ErrorCode = ErrorCodeFailed
@@ -139,12 +140,12 @@ func (s *Service) GetOldestTimestampAsync(ctx context.Context, addresses []commo
 	s.scheduler.Enqueue(getOldestTimestampTask, func(ctx context.Context) (interface{}, error) {
 		timestamp, err := GetOldestTimestamp(ctx, s.db, addresses)
 		return timestamp, err
-	}, func(result interface{}, taskType TaskType, err error) {
+	}, func(result interface{}, taskType async.TaskType, err error) {
 		res := GetOldestTimestampResponse{
 			ErrorCode: ErrorCodeFailed,
 		}
 
-		if errors.Is(err, context.Canceled) || errors.Is(err, ErrTaskOverwritten) {
+		if errors.Is(err, context.Canceled) || errors.Is(err, async.ErrTaskOverwritten) {
 			res.ErrorCode = ErrorCodeTaskCanceled
 		} else if err == nil {
 			res.Timestamp = result.(int64)
diff --git a/services/wallet/activity/scheduler.go b/services/wallet/async/scheduler.go
similarity index 99%
rename from services/wallet/activity/scheduler.go
rename to services/wallet/async/scheduler.go
index aceb1957b..c08e89df6 100644
--- a/services/wallet/activity/scheduler.go
+++ b/services/wallet/async/scheduler.go
@@ -1,4 +1,4 @@
-package activity
+package async
 
 import (
 	"context"
diff --git a/services/wallet/activity/scheduler_test.go b/services/wallet/async/scheduler_test.go
similarity index 99%
rename from services/wallet/activity/scheduler_test.go
rename to services/wallet/async/scheduler_test.go
index 46c62c13a..b2304d0e7 100644
--- a/services/wallet/activity/scheduler_test.go
+++ b/services/wallet/async/scheduler_test.go
@@ -1,4 +1,4 @@
-package activity
+package async
 
 import (
 	"context"