diff --git a/Makefile b/Makefile
index 8bd8afa..8fd2f7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GOARCH ?= arm64
+GOARCH ?= amd64
 
 .PHONY: formolcli
 formolcli: fmt vet
diff --git a/backupsession/server/backupsession_controller.go b/backupsession/server/backupsession_controller.go
deleted file mode 100644
index dddb8a2..0000000
--- a/backupsession/server/backupsession_controller.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package server
-
-import (
-	"context"
-	"github.com/go-logr/logr"
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
-	formolv1alpha1 "github.com/desmo999r/formol/api/v1alpha1"
-)
-
-type BackupSessionReconciler struct {
-	client.Client
-	Log    logr.Logger
-	Scheme *runtime.Scheme
-}
-
-func (r *BackupSessionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	r.Log = log.FromContext(ctx)
-	r.Log.V(0).Info("Enter Reconcile with req", "req", req)
-	return ctrl.Result{}, nil
-}
-
-// SetupWithManager sets up the controller with the Manager.
-func (r *BackupSessionReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&formolv1alpha1.BackupSession{}).
-		Complete(r)
-}
diff --git a/cmd/backupsession.go b/cmd/backupsession.go
index 19862ce..38e7495 100644
--- a/cmd/backupsession.go
+++ b/cmd/backupsession.go
@@ -6,7 +6,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/desmo999r/formolcli/backupsession"
-	"github.com/desmo999r/formolcli/backupsession/server"
+	"github.com/desmo999r/formolcli/controllers"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 )
@@ -30,7 +30,7 @@ var startServerCmd = &cobra.Command{
 	Short: "Start a BackupSession controller",
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("starts backupsession controller")
-		server.StartServer()
+		controllers.StartServer()
 	},
 }
 
diff --git a/controllers/backupsession_controller.go b/controllers/backupsession_controller.go
new file mode 100644
index 0000000..59bb5c9
--- /dev/null
+++ b/controllers/backupsession_controller.go
@@ -0,0 +1,112 @@
+package controllers
+
+import (
+	"context"
+	"github.com/go-logr/logr"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime"
+	"os"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"time"
+
+	formolv1alpha1 "github.com/desmo999r/formol/api/v1alpha1"
+)
+
+type BackupSessionReconciler struct {
+	client.Client
+	Log    logr.Logger
+	Scheme *runtime.Scheme
+}
+
+func (r *BackupSessionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	r.Log = log.FromContext(ctx)
+	r.Log.V(0).Info("Enter Reconcile with req", "req", req)
+
+	backupSession := formolv1alpha1.BackupSession{}
+	err := r.Get(ctx, req.NamespacedName, &backupSession)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
+		return ctrl.Result{}, err
+	}
+	if len(backupSession.Status.Targets) == 0 {
+		// The main BackupSession controller hasn't assigned a backup task yet
+		// Wait a bit
+		r.Log.V(0).Info("No task has been assigned yet. Wait a bit...")
+		return ctrl.Result{RequeueAfter: 10 * time.Second}, nil
+	}
+	//	backupConf := formolv1alpha1.BackupConfiguration{}
+	//	err := r.Get(ctx, client.ObjectKey {
+	//		Namespace: backupSession.Spec.Ref.Namespace,
+	//		Name: backupSession.Spec.Ref.Name,
+	//	}, &backupConf)
+	//	if err != nil {
+	//		if errors.IsNotFound(err) {
+	//			return ctrl.Result{}, nil
+	//		}
+	//		return ctrl.Result{}, err
+	//	}
+
+	targetName := os.Getenv(formolv1alpha1.TARGET_NAME)
+	// we don't want a copy because we will modify and update it.
+	currentTargetStatus := &(backupSession.Status.Targets[len(backupSession.Status.Targets)-1])
+	if currentTargetStatus.TargetName == targetName {
+		// The current task is for us
+		switch currentTargetStatus.SessionState {
+		case formolv1alpha1.New:
+			r.Log.V(0).Info("New session, move to Initializing state")
+			currentTargetStatus.SessionState = formolv1alpha1.Init
+			err := r.Status().Update(ctx, &backupSession)
+			if err != nil {
+				r.Log.Error(err, "unable to update BackupSession status")
+			}
+			return ctrl.Result{}, err
+		case formolv1alpha1.Init:
+			r.Log.V(0).Info("Start to run the backup initializing steps is any")
+			// Runs the Steps functions in chroot env
+			result := formolv1alpha1.Running
+			currentTargetStatus.SessionState = result
+			err := r.Status().Update(ctx, &backupSession)
+			if err != nil {
+				r.Log.Error(err, "unable to update BackupSession status")
+			}
+			return ctrl.Result{}, err
+		case formolv1alpha1.Running:
+			r.Log.V(0).Info("Running state. Do the backup")
+			// Actually do the backup with restic
+			currentTargetStatus.SessionState = formolv1alpha1.Finalize
+			err := r.Status().Update(ctx, &backupSession)
+			if err != nil {
+				r.Log.Error(err, "unable to update BackupSession status")
+			}
+			return ctrl.Result{}, err
+		case formolv1alpha1.Finalize:
+			r.Log.V(0).Info("Backup is over. Run the finalize steps is any")
+			// Runs the finalize Steps functions in chroot env
+			if currentTargetStatus.SnapshotId == "" {
+				currentTargetStatus.SessionState = formolv1alpha1.Failure
+			} else {
+				currentTargetStatus.SessionState = formolv1alpha1.Success
+			}
+			err := r.Status().Update(ctx, &backupSession)
+			if err != nil {
+				r.Log.Error(err, "unable to update BackupSession status")
+			}
+			return ctrl.Result{}, err
+		case formolv1alpha1.Success:
+		case formolv1alpha1.Failure:
+			r.Log.V(0).Info("Backup is over")
+		}
+	}
+	return ctrl.Result{}, nil
+}
+
+// SetupWithManager sets up the controller with the Manager.
+func (r *BackupSessionReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&formolv1alpha1.BackupSession{}).
+		Complete(r)
+}
diff --git a/backupsession/server/server.go b/controllers/server.go
similarity index 98%
rename from backupsession/server/server.go
rename to controllers/server.go
index 4708f45..8a38c72 100644
--- a/backupsession/server/server.go
+++ b/controllers/server.go
@@ -1,4 +1,4 @@
-package server
+package controllers
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"