diff --git a/cmd/acl-handlers.go b/legacy/acl-handlers.go
similarity index 98%
rename from cmd/acl-handlers.go
rename to legacy/acl-handlers.go
index 931b44907..8bb7c4cba 100644
--- a/cmd/acl-handlers.go
+++ b/legacy/acl-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -23,8 +23,8 @@ import (
 	"net/url"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/admin-handlers-config-kv.go b/legacy/admin-handlers-config-kv.go
similarity index 96%
rename from cmd/admin-handlers-config-kv.go
rename to legacy/admin-handlers-config-kv.go
index 89ffa942d..052679e52 100644
--- a/cmd/admin-handlers-config-kv.go
+++ b/legacy/admin-handlers-config-kv.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,15 +26,15 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/etcd"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/etcd"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/admin-handlers-users.go b/legacy/admin-handlers-users.go
similarity index 99%
rename from cmd/admin-handlers-users.go
rename to legacy/admin-handlers-users.go
index 3aff70741..b433185d5 100644
--- a/cmd/admin-handlers-users.go
+++ b/legacy/admin-handlers-users.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/admin-handlers.go b/legacy/admin-handlers.go
similarity index 99%
rename from cmd/admin-handlers.go
rename to legacy/admin-handlers.go
index 3b321b542..c86b89e62 100644
--- a/cmd/admin-handlers.go
+++ b/legacy/admin-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -36,12 +36,12 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/handlers"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
diff --git a/cmd/admin-handlers_test.go b/legacy/admin-handlers_test.go
similarity index 99%
rename from cmd/admin-handlers_test.go
rename to legacy/admin-handlers_test.go
index 5955a50e1..8ed9fd56d 100644
--- a/cmd/admin-handlers_test.go
+++ b/legacy/admin-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/admin-heal-ops.go b/legacy/admin-heal-ops.go
similarity index 99%
rename from cmd/admin-heal-ops.go
rename to legacy/admin-heal-ops.go
index 19a8b65d9..7623bf880 100644
--- a/cmd/admin-heal-ops.go
+++ b/legacy/admin-heal-ops.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/admin-quota-handlers.go b/legacy/admin-quota-handlers.go
similarity index 97%
rename from cmd/admin-quota-handlers.go
rename to legacy/admin-quota-handlers.go
index 3a65d7112..9590c38cb 100644
--- a/cmd/admin-quota-handlers.go
+++ b/legacy/admin-quota-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -22,8 +22,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 )
diff --git a/cmd/admin-router.go b/legacy/admin-router.go
similarity index 99%
rename from cmd/admin-router.go
rename to legacy/admin-router.go
index f3c877339..bd218a9f4 100644
--- a/cmd/admin-router.go
+++ b/legacy/admin-router.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/madmin"
 )
diff --git a/cmd/admin-server-info.go b/legacy/admin-server-info.go
similarity index 99%
rename from cmd/admin-server-info.go
rename to legacy/admin-server-info.go
index d6f562658..6696b327a 100644
--- a/cmd/admin-server-info.go
+++ b/legacy/admin-server-info.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/api-datatypes.go b/legacy/api-datatypes.go
similarity index 98%
rename from cmd/api-datatypes.go
rename to legacy/api-datatypes.go
index 59f2fd41e..384a078e3 100644
--- a/cmd/api-datatypes.go
+++ b/legacy/api-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
diff --git a/cmd/api-errors.go b/legacy/api-errors.go
similarity index 99%
rename from cmd/api-errors.go
rename to legacy/api-errors.go
index 3d334d9c5..232d2ec90 100644
--- a/cmd/api-errors.go
+++ b/legacy/api-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,9 +29,9 @@ import (
 
 	minio "github.com/minio/minio-go/v6"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
diff --git a/cmd/api-errors_test.go b/legacy/api-errors_test.go
similarity index 98%
rename from cmd/api-errors_test.go
rename to legacy/api-errors_test.go
index dab7a811a..86f24f57b 100644
--- a/cmd/api-errors_test.go
+++ b/legacy/api-errors_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/api-headers.go b/legacy/api-headers.go
similarity index 97%
rename from cmd/api-headers.go
rename to legacy/api-headers.go
index a9b8031d0..a5d1a3d95 100644
--- a/cmd/api-headers.go
+++ b/legacy/api-headers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // Returns a hexadecimal representation of time at the
diff --git a/cmd/api-headers_test.go b/legacy/api-headers_test.go
similarity index 98%
rename from cmd/api-headers_test.go
rename to legacy/api-headers_test.go
index 26ca9198c..f85408a16 100644
--- a/cmd/api-headers_test.go
+++ b/legacy/api-headers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/api-resources.go b/legacy/api-resources.go
similarity index 99%
rename from cmd/api-resources.go
rename to legacy/api-resources.go
index d3f1eaa92..7588971af 100644
--- a/cmd/api-resources.go
+++ b/legacy/api-resources.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
diff --git a/cmd/api-resources_test.go b/legacy/api-resources_test.go
similarity index 99%
rename from cmd/api-resources_test.go
rename to legacy/api-resources_test.go
index a21026658..b87606817 100644
--- a/cmd/api-resources_test.go
+++ b/legacy/api-resources_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/url"
diff --git a/cmd/api-response.go b/legacy/api-response.go
similarity index 99%
rename from cmd/api-response.go
rename to legacy/api-response.go
index b5bbc1170..89de23a77 100644
--- a/cmd/api-response.go
+++ b/legacy/api-response.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 )
 
diff --git a/cmd/api-response_test.go b/legacy/api-response_test.go
similarity index 99%
rename from cmd/api-response_test.go
rename to legacy/api-response_test.go
index 76c70f198..9dc0a36b4 100644
--- a/cmd/api-response_test.go
+++ b/legacy/api-response_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/api-router.go b/legacy/api-router.go
similarity index 99%
rename from cmd/api-router.go
rename to legacy/api-router.go
index 4011c9aa5..ffecfd7a3 100644
--- a/cmd/api-router.go
+++ b/legacy/api-router.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 func newHTTPServerFn() *xhttp.Server {
diff --git a/cmd/api-utils.go b/legacy/api-utils.go
similarity index 99%
rename from cmd/api-utils.go
rename to legacy/api-utils.go
index 0e370b1be..613a412d5 100644
--- a/cmd/api-utils.go
+++ b/legacy/api-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"strings"
diff --git a/cmd/api-utils_test.go b/legacy/api-utils_test.go
similarity index 98%
rename from cmd/api-utils_test.go
rename to legacy/api-utils_test.go
index 0ef817964..5ecec054e 100644
--- a/cmd/api-utils_test.go
+++ b/legacy/api-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/auth-handler.go b/legacy/auth-handler.go
similarity index 99%
rename from cmd/auth-handler.go
rename to legacy/auth-handler.go
index 8b133e427..0d66d7688 100644
--- a/cmd/auth-handler.go
+++ b/legacy/auth-handler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,9 +30,9 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
diff --git a/cmd/auth-handler_test.go b/legacy/auth-handler_test.go
similarity index 99%
rename from cmd/auth-handler_test.go
rename to legacy/auth-handler_test.go
index 92e72e851..417fb9ef4 100644
--- a/cmd/auth-handler_test.go
+++ b/legacy/auth-handler_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/background-heal-ops.go b/legacy/background-heal-ops.go
similarity index 98%
rename from cmd/background-heal-ops.go
rename to legacy/background-heal-ops.go
index b7d6b142e..96bb19d06 100644
--- a/cmd/background-heal-ops.go
+++ b/legacy/background-heal-ops.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/background-newdisks-heal-ops.go b/legacy/background-newdisks-heal-ops.go
similarity index 98%
rename from cmd/background-newdisks-heal-ops.go
rename to legacy/background-newdisks-heal-ops.go
index 5bfc86fde..99900c6b6 100644
--- a/cmd/background-newdisks-heal-ops.go
+++ b/legacy/background-newdisks-heal-ops.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 const defaultMonitorNewDiskInterval = time.Minute * 10
diff --git a/cmd/benchmark-utils_test.go b/legacy/benchmark-utils_test.go
similarity index 99%
rename from cmd/benchmark-utils_test.go
rename to legacy/benchmark-utils_test.go
index c13772872..520352558 100644
--- a/cmd/benchmark-utils_test.go
+++ b/legacy/benchmark-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bitrot-streaming.go b/legacy/bitrot-streaming.go
similarity index 98%
rename from cmd/bitrot-streaming.go
rename to legacy/bitrot-streaming.go
index b05fbe170..21dd521df 100644
--- a/cmd/bitrot-streaming.go
+++ b/legacy/bitrot-streaming.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -23,7 +23,7 @@ import (
 	"hash"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 type errHashMismatch struct {
diff --git a/cmd/bitrot-whole.go b/legacy/bitrot-whole.go
similarity index 98%
rename from cmd/bitrot-whole.go
rename to legacy/bitrot-whole.go
index fc016b56f..19c2eb7eb 100644
--- a/cmd/bitrot-whole.go
+++ b/legacy/bitrot-whole.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"hash"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Implementation to calculate bitrot for the whole file.
diff --git a/cmd/bitrot.go b/legacy/bitrot.go
similarity index 98%
rename from cmd/bitrot.go
rename to legacy/bitrot.go
index bfdecfbd3..cd61b3576 100644
--- a/cmd/bitrot.go
+++ b/legacy/bitrot.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/minio/highwayhash"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"golang.org/x/crypto/blake2b"
 )
diff --git a/cmd/bitrot_test.go b/legacy/bitrot_test.go
similarity index 99%
rename from cmd/bitrot_test.go
rename to legacy/bitrot_test.go
index 78cf9dc5c..b4bb0937d 100644
--- a/cmd/bitrot_test.go
+++ b/legacy/bitrot_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"
diff --git a/cmd/bootstrap-peer-server.go b/legacy/bootstrap-peer-server.go
similarity index 98%
rename from cmd/bootstrap-peer-server.go
rename to legacy/bootstrap-peer-server.go
index 4692d15ad..971f85bc0 100644
--- a/cmd/bootstrap-peer-server.go
+++ b/legacy/bootstrap-peer-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -30,9 +30,9 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio/minio-go/v6/pkg/set"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 )
 
 const (
diff --git a/cmd/bucket-encryption-handlers.go b/legacy/bucket-encryption-handlers.go
similarity index 99%
rename from cmd/bucket-encryption-handlers.go
rename to legacy/bucket-encryption-handlers.go
index 866ba2079..aea3ca71f 100644
--- a/cmd/bucket-encryption-handlers.go
+++ b/legacy/bucket-encryption-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -23,7 +23,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/bucket-encryption.go b/legacy/bucket-encryption.go
similarity index 99%
rename from cmd/bucket-encryption.go
rename to legacy/bucket-encryption.go
index b5504c909..4d574d44d 100644
--- a/cmd/bucket-encryption.go
+++ b/legacy/bucket-encryption.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/bucket-encryption_test.go b/legacy/bucket-encryption_test.go
similarity index 99%
rename from cmd/bucket-encryption_test.go
rename to legacy/bucket-encryption_test.go
index 25548caf3..5d4380768 100644
--- a/cmd/bucket-encryption_test.go
+++ b/legacy/bucket-encryption_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-handlers.go b/legacy/bucket-handlers.go
similarity index 99%
rename from cmd/bucket-handlers.go
rename to legacy/bucket-handlers.go
index ce0ca1af0..20d714d90 100644
--- a/cmd/bucket-handlers.go
+++ b/legacy/bucket-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
@@ -28,13 +28,12 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-
 	"github.com/minio/minio-go/v6/pkg/set"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
diff --git a/cmd/bucket-handlers_test.go b/legacy/bucket-handlers_test.go
similarity index 99%
rename from cmd/bucket-handlers_test.go
rename to legacy/bucket-handlers_test.go
index 3f4f80706..c6b6ae3a1 100644
--- a/cmd/bucket-handlers_test.go
+++ b/legacy/bucket-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-lifecycle-handlers.go b/legacy/bucket-lifecycle-handlers.go
similarity index 98%
rename from cmd/bucket-lifecycle-handlers.go
rename to legacy/bucket-lifecycle-handlers.go
index bd381b2cb..445b031cb 100644
--- a/cmd/bucket-lifecycle-handlers.go
+++ b/legacy/bucket-lifecycle-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
@@ -22,8 +22,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
diff --git a/cmd/bucket-lifecycle-handlers_test.go b/legacy/bucket-lifecycle-handlers_test.go
similarity index 99%
rename from cmd/bucket-lifecycle-handlers_test.go
rename to legacy/bucket-lifecycle-handlers_test.go
index 3af5daf05..86512e43b 100644
--- a/cmd/bucket-lifecycle-handlers_test.go
+++ b/legacy/bucket-lifecycle-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-lifecycle.go b/legacy/bucket-lifecycle.go
similarity index 98%
rename from cmd/bucket-lifecycle.go
rename to legacy/bucket-lifecycle.go
index fd7c9f6df..f8a81d9cd 100644
--- a/cmd/bucket-lifecycle.go
+++ b/legacy/bucket-lifecycle.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"github.com/minio/minio/pkg/bucket/lifecycle"
diff --git a/cmd/bucket-listobjects-handlers.go b/legacy/bucket-listobjects-handlers.go
similarity index 99%
rename from cmd/bucket-listobjects-handlers.go
rename to legacy/bucket-listobjects-handlers.go
index ad03b1fd5..0c4ccfff9 100644
--- a/cmd/bucket-listobjects-handlers.go
+++ b/legacy/bucket-listobjects-handlers.go
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
-
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/bucket-metadata-sys.go b/legacy/bucket-metadata-sys.go
similarity index 99%
rename from cmd/bucket-metadata-sys.go
rename to legacy/bucket-metadata-sys.go
index 6ee467c7e..6d7d9cebb 100644
--- a/cmd/bucket-metadata-sys.go
+++ b/legacy/bucket-metadata-sys.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-metadata.go b/legacy/bucket-metadata.go
similarity index 99%
rename from cmd/bucket-metadata.go
rename to legacy/bucket-metadata.go
index 6db13678a..78da91c50 100644
--- a/cmd/bucket-metadata.go
+++ b/legacy/bucket-metadata.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	bucketsse "github.com/minio/minio/pkg/bucket/encryption"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
diff --git a/cmd/bucket-metadata_gen.go b/legacy/bucket-metadata_gen.go
similarity index 99%
rename from cmd/bucket-metadata_gen.go
rename to legacy/bucket-metadata_gen.go
index 5ec12ebdc..390886d16 100644
--- a/cmd/bucket-metadata_gen.go
+++ b/legacy/bucket-metadata_gen.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/bucket-metadata_gen_test.go b/legacy/bucket-metadata_gen_test.go
similarity index 99%
rename from cmd/bucket-metadata_gen_test.go
rename to legacy/bucket-metadata_gen_test.go
index 066a68d16..203e6745e 100644
--- a/cmd/bucket-metadata_gen_test.go
+++ b/legacy/bucket-metadata_gen_test.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/bucket-notification-handlers.go b/legacy/bucket-notification-handlers.go
similarity index 98%
rename from cmd/bucket-notification-handlers.go
rename to legacy/bucket-notification-handlers.go
index 36367d32b..ec31a3ad9 100644
--- a/cmd/bucket-notification-handlers.go
+++ b/legacy/bucket-notification-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
 )
diff --git a/cmd/bucket-object-lock.go b/legacy/bucket-object-lock.go
similarity index 99%
rename from cmd/bucket-object-lock.go
rename to legacy/bucket-object-lock.go
index 73b103579..1652ce343 100644
--- a/cmd/bucket-object-lock.go
+++ b/legacy/bucket-object-lock.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"math"
 	"net/http"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
diff --git a/cmd/bucket-policy-handlers.go b/legacy/bucket-policy-handlers.go
similarity index 99%
rename from cmd/bucket-policy-handlers.go
rename to legacy/bucket-policy-handlers.go
index f659d2466..b59093a59 100644
--- a/cmd/bucket-policy-handlers.go
+++ b/legacy/bucket-policy-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -23,7 +23,7 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/bucket-policy-handlers_test.go b/legacy/bucket-policy-handlers_test.go
similarity index 99%
rename from cmd/bucket-policy-handlers_test.go
rename to legacy/bucket-policy-handlers_test.go
index 91c1b5cdf..c2f67c489 100644
--- a/cmd/bucket-policy-handlers_test.go
+++ b/legacy/bucket-policy-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/bucket-policy.go b/legacy/bucket-policy.go
similarity index 98%
rename from cmd/bucket-policy.go
rename to legacy/bucket-policy.go
index baec0f42f..2f04a8cfd 100644
--- a/cmd/bucket-policy.go
+++ b/legacy/bucket-policy.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
@@ -26,8 +26,8 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	miniogopolicy "github.com/minio/minio-go/v6/pkg/policy"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/handlers"
 )
diff --git a/cmd/bucket-quota.go b/legacy/bucket-quota.go
similarity index 98%
rename from cmd/bucket-quota.go
rename to legacy/bucket-quota.go
index 4fdcf6d3d..93a7313b5 100644
--- a/cmd/bucket-quota.go
+++ b/legacy/bucket-quota.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/build-constants.go b/legacy/build-constants.go
similarity index 98%
rename from cmd/build-constants.go
rename to legacy/build-constants.go
index 8b9a278b5..adcc5343b 100644
--- a/cmd/build-constants.go
+++ b/legacy/build-constants.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // DO NOT EDIT THIS FILE DIRECTLY. These are build-time constants
 // set through ‘buildscripts/gen-ldflags.go’.
diff --git a/cmd/common-main.go b/legacy/common-main.go
similarity index 98%
rename from cmd/common-main.go
rename to legacy/common-main.go
index 4fc455b3a..78c00c1ab 100644
--- a/cmd/common-main.go
+++ b/legacy/common-main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -29,8 +29,8 @@ import (
 	dns2 "github.com/miekg/dns"
 	"github.com/minio/cli"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/env"
diff --git a/cmd/config-common.go b/legacy/config-common.go
similarity index 97%
rename from cmd/config-common.go
rename to legacy/config-common.go
index 1cc9543d1..d444742f7 100644
--- a/cmd/config-common.go
+++ b/legacy/config-common.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
 	"context"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/config-current.go b/legacy/config-current.go
similarity index 96%
rename from cmd/config-current.go
rename to legacy/config-current.go
index 9fddd1c8b..eb50fdc9f 100644
--- a/cmd/config-current.go
+++ b/legacy/config-current.go
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
 	"strings"
 	"sync"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/api"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/config/etcd"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/target/http"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/api"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/target/http"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/madmin"
 )
diff --git a/cmd/config-current_test.go b/legacy/config-current_test.go
similarity index 96%
rename from cmd/config-current_test.go
rename to legacy/config-current_test.go
index c77a744bd..c60517d46 100644
--- a/cmd/config-current_test.go
+++ b/legacy/config-current_test.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"os"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 func TestServerConfig(t *testing.T) {
diff --git a/cmd/config-dir.go b/legacy/config-dir.go
similarity index 99%
rename from cmd/config-dir.go
rename to legacy/config-dir.go
index c76ed30ea..dda3a0242 100644
--- a/cmd/config-dir.go
+++ b/legacy/config-dir.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/config-encrypted.go b/legacy/config-encrypted.go
similarity index 98%
rename from cmd/config-encrypted.go
rename to legacy/config-encrypted.go
index 170365381..2e756f909 100644
--- a/cmd/config-encrypted.go
+++ b/legacy/config-encrypted.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 	"unicode/utf8"
 
 	etcd "github.com/coreos/etcd/clientv3"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/madmin"
 )
diff --git a/cmd/config-encrypted_test.go b/legacy/config-encrypted_test.go
similarity index 99%
rename from cmd/config-encrypted_test.go
rename to legacy/config-encrypted_test.go
index 860e16822..2190f0ba3 100644
--- a/cmd/config-encrypted_test.go
+++ b/legacy/config-encrypted_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/config-migrate.go b/legacy/config-migrate.go
similarity index 99%
rename from cmd/config-migrate.go
rename to legacy/config-migrate.go
index 23e56c795..b82b40e56 100644
--- a/cmd/config-migrate.go
+++ b/legacy/config-migrate.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,16 +25,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/event/target"
diff --git a/cmd/config-migrate_test.go b/legacy/config-migrate_test.go
similarity index 99%
rename from cmd/config-migrate_test.go
rename to legacy/config-migrate_test.go
index 5cd087b30..9fe9ac947 100644
--- a/cmd/config-migrate_test.go
+++ b/legacy/config-migrate_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -22,7 +22,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Test if config v1 is purged
diff --git a/cmd/config-versions.go b/legacy/config-versions.go
similarity index 98%
rename from cmd/config-versions.go
rename to legacy/config-versions.go
index 60849554e..8d96d2d80 100644
--- a/cmd/config-versions.go
+++ b/legacy/config-versions.go
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"sync"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/notify"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/notify"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/event/target"
 	"github.com/minio/minio/pkg/quick"
diff --git a/cmd/config.go b/legacy/config.go
similarity index 99%
rename from cmd/config.go
rename to legacy/config.go
index ef51107f6..67bec8e17 100644
--- a/cmd/config.go
+++ b/legacy/config.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/config/api/api.go b/legacy/config/api/api.go
similarity index 98%
rename from cmd/config/api/api.go
rename to legacy/config/api/api.go
index 3ae52dbe5..dd9ff6ae5 100644
--- a/cmd/config/api/api.go
+++ b/legacy/config/api/api.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/api/help.go b/legacy/config/api/help.go
similarity index 96%
rename from cmd/config/api/help.go
rename to legacy/config/api/help.go
index f9072a6df..f233802b9 100644
--- a/cmd/config/api/help.go
+++ b/legacy/config/api/help.go
@@ -16,7 +16,7 @@
 
 package api
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for storageclass feature.
 var (
diff --git a/cmd/config/bool-flag.go b/legacy/config/bool-flag.go
similarity index 100%
rename from cmd/config/bool-flag.go
rename to legacy/config/bool-flag.go
diff --git a/cmd/config/bool-flag_test.go b/legacy/config/bool-flag_test.go
similarity index 100%
rename from cmd/config/bool-flag_test.go
rename to legacy/config/bool-flag_test.go
diff --git a/cmd/config/cache/config.go b/legacy/config/cache/config.go
similarity index 99%
rename from cmd/config/cache/config.go
rename to legacy/config/cache/config.go
index 125860da6..0a780d144 100644
--- a/cmd/config/cache/config.go
+++ b/legacy/config/cache/config.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/ellipses"
 )
 
diff --git a/cmd/config/cache/config_test.go b/legacy/config/cache/config_test.go
similarity index 100%
rename from cmd/config/cache/config_test.go
rename to legacy/config/cache/config_test.go
diff --git a/cmd/config/cache/help.go b/legacy/config/cache/help.go
similarity index 97%
rename from cmd/config/cache/help.go
rename to legacy/config/cache/help.go
index 0a346461c..c01cc5836 100644
--- a/cmd/config/cache/help.go
+++ b/legacy/config/cache/help.go
@@ -16,7 +16,7 @@
 
 package cache
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for caching feature.
 var (
diff --git a/cmd/config/cache/legacy.go b/legacy/config/cache/legacy.go
similarity index 97%
rename from cmd/config/cache/legacy.go
rename to legacy/config/cache/legacy.go
index 938850c43..a6a9faf0e 100644
--- a/cmd/config/cache/legacy.go
+++ b/legacy/config/cache/legacy.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 const (
diff --git a/cmd/config/cache/lookup.go b/legacy/config/cache/lookup.go
similarity index 99%
rename from cmd/config/cache/lookup.go
rename to legacy/config/cache/lookup.go
index d487c55b6..68ba30fa2 100644
--- a/cmd/config/cache/lookup.go
+++ b/legacy/config/cache/lookup.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/certs.go b/legacy/config/certs.go
similarity index 100%
rename from cmd/config/certs.go
rename to legacy/config/certs.go
diff --git a/cmd/config/certs_test.go b/legacy/config/certs_test.go
similarity index 100%
rename from cmd/config/certs_test.go
rename to legacy/config/certs_test.go
diff --git a/cmd/config/certsinfo.go b/legacy/config/certsinfo.go
similarity index 100%
rename from cmd/config/certsinfo.go
rename to legacy/config/certsinfo.go
diff --git a/cmd/config/compress/compress.go b/legacy/config/compress/compress.go
similarity index 98%
rename from cmd/config/compress/compress.go
rename to legacy/config/compress/compress.go
index a72dfc9a6..092e03ac6 100644
--- a/cmd/config/compress/compress.go
+++ b/legacy/config/compress/compress.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/compress/compress_test.go b/legacy/config/compress/compress_test.go
similarity index 100%
rename from cmd/config/compress/compress_test.go
rename to legacy/config/compress/compress_test.go
diff --git a/cmd/config/compress/help.go b/legacy/config/compress/help.go
similarity index 96%
rename from cmd/config/compress/help.go
rename to legacy/config/compress/help.go
index b292cd6bc..c7f47838b 100644
--- a/cmd/config/compress/help.go
+++ b/legacy/config/compress/help.go
@@ -16,7 +16,7 @@
 
 package compress
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for compress feature.
 var (
diff --git a/cmd/config/compress/legacy.go b/legacy/config/compress/legacy.go
similarity index 97%
rename from cmd/config/compress/legacy.go
rename to legacy/config/compress/legacy.go
index 379e8f8e0..8f8d3d774 100644
--- a/cmd/config/compress/legacy.go
+++ b/legacy/config/compress/legacy.go
@@ -19,7 +19,7 @@ package compress
 import (
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Legacy envs.
diff --git a/cmd/config/config.go b/legacy/config/config.go
similarity index 100%
rename from cmd/config/config.go
rename to legacy/config/config.go
diff --git a/cmd/config/config_test.go b/legacy/config/config_test.go
similarity index 100%
rename from cmd/config/config_test.go
rename to legacy/config/config_test.go
diff --git a/cmd/config/constants.go b/legacy/config/constants.go
similarity index 100%
rename from cmd/config/constants.go
rename to legacy/config/constants.go
diff --git a/cmd/config/errors-utils.go b/legacy/config/errors-utils.go
similarity index 100%
rename from cmd/config/errors-utils.go
rename to legacy/config/errors-utils.go
diff --git a/cmd/config/errors.go b/legacy/config/errors.go
similarity index 100%
rename from cmd/config/errors.go
rename to legacy/config/errors.go
diff --git a/cmd/config/etcd/dns/etcd_dns.go b/legacy/config/etcd/dns/etcd_dns.go
similarity index 100%
rename from cmd/config/etcd/dns/etcd_dns.go
rename to legacy/config/etcd/dns/etcd_dns.go
diff --git a/cmd/config/etcd/dns/types.go b/legacy/config/etcd/dns/types.go
similarity index 100%
rename from cmd/config/etcd/dns/types.go
rename to legacy/config/etcd/dns/types.go
diff --git a/cmd/config/etcd/etcd.go b/legacy/config/etcd/etcd.go
similarity index 99%
rename from cmd/config/etcd/etcd.go
rename to legacy/config/etcd/etcd.go
index 67fb78f18..23d7569fb 100644
--- a/cmd/config/etcd/etcd.go
+++ b/legacy/config/etcd/etcd.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/namespace"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/config/etcd/etcd_test.go b/legacy/config/etcd/etcd_test.go
similarity index 100%
rename from cmd/config/etcd/etcd_test.go
rename to legacy/config/etcd/etcd_test.go
diff --git a/cmd/config/etcd/help.go b/legacy/config/etcd/help.go
similarity index 97%
rename from cmd/config/etcd/help.go
rename to legacy/config/etcd/help.go
index 8009709d1..6d7d1c2f2 100644
--- a/cmd/config/etcd/help.go
+++ b/legacy/config/etcd/help.go
@@ -16,7 +16,7 @@
 
 package etcd
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // etcd config documented in default config
 var (
diff --git a/cmd/config/help.go b/legacy/config/help.go
similarity index 100%
rename from cmd/config/help.go
rename to legacy/config/help.go
diff --git a/cmd/config/identity/ldap/config.go b/legacy/config/identity/ldap/config.go
similarity index 99%
rename from cmd/config/identity/ldap/config.go
rename to legacy/config/identity/ldap/config.go
index b4ac1df62..4b3c09cc6 100644
--- a/cmd/config/identity/ldap/config.go
+++ b/legacy/config/identity/ldap/config.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	ldap "gopkg.in/ldap.v3"
 )
diff --git a/cmd/config/identity/ldap/help.go b/legacy/config/identity/ldap/help.go
similarity index 98%
rename from cmd/config/identity/ldap/help.go
rename to legacy/config/identity/ldap/help.go
index b3d14b0ce..a78d2ee7c 100644
--- a/cmd/config/identity/ldap/help.go
+++ b/legacy/config/identity/ldap/help.go
@@ -16,7 +16,7 @@
 
 package ldap
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for LDAP identity feature.
 var (
diff --git a/cmd/config/identity/ldap/legacy.go b/legacy/config/identity/ldap/legacy.go
similarity index 96%
rename from cmd/config/identity/ldap/legacy.go
rename to legacy/config/identity/ldap/legacy.go
index 98f36c1f9..24d0d725d 100644
--- a/cmd/config/identity/ldap/legacy.go
+++ b/legacy/config/identity/ldap/legacy.go
@@ -16,7 +16,7 @@
 
 package ldap
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // SetIdentityLDAP - One time migration code needed, for migrating from older config to new for LDAPConfig.
 func SetIdentityLDAP(s config.Config, ldapArgs Config) {
diff --git a/cmd/config/identity/openid/ecdsa-sha3.go b/legacy/config/identity/openid/ecdsa-sha3.go
similarity index 100%
rename from cmd/config/identity/openid/ecdsa-sha3.go
rename to legacy/config/identity/openid/ecdsa-sha3.go
diff --git a/cmd/config/identity/openid/help.go b/legacy/config/identity/openid/help.go
similarity index 97%
rename from cmd/config/identity/openid/help.go
rename to legacy/config/identity/openid/help.go
index 9bb249c75..9e89dce5d 100644
--- a/cmd/config/identity/openid/help.go
+++ b/legacy/config/identity/openid/help.go
@@ -16,7 +16,7 @@
 
 package openid
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for OpenID identity feature.
 var (
diff --git a/cmd/config/identity/openid/jwks.go b/legacy/config/identity/openid/jwks.go
similarity index 100%
rename from cmd/config/identity/openid/jwks.go
rename to legacy/config/identity/openid/jwks.go
diff --git a/cmd/config/identity/openid/jwks_test.go b/legacy/config/identity/openid/jwks_test.go
similarity index 100%
rename from cmd/config/identity/openid/jwks_test.go
rename to legacy/config/identity/openid/jwks_test.go
diff --git a/cmd/config/identity/openid/jwt.go b/legacy/config/identity/openid/jwt.go
similarity index 99%
rename from cmd/config/identity/openid/jwt.go
rename to legacy/config/identity/openid/jwt.go
index b652d422a..519c9cc88 100644
--- a/cmd/config/identity/openid/jwt.go
+++ b/legacy/config/identity/openid/jwt.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	jwtgo "github.com/dgrijalva/jwt-go"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
diff --git a/cmd/config/identity/openid/jwt_test.go b/legacy/config/identity/openid/jwt_test.go
similarity index 100%
rename from cmd/config/identity/openid/jwt_test.go
rename to legacy/config/identity/openid/jwt_test.go
diff --git a/cmd/config/identity/openid/legacy.go b/legacy/config/identity/openid/legacy.go
similarity index 96%
rename from cmd/config/identity/openid/legacy.go
rename to legacy/config/identity/openid/legacy.go
index de9adc949..3999778f9 100644
--- a/cmd/config/identity/openid/legacy.go
+++ b/legacy/config/identity/openid/legacy.go
@@ -16,7 +16,7 @@
 
 package openid
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Legacy envs
 const (
diff --git a/cmd/config/identity/openid/rsa-sha3.go b/legacy/config/identity/openid/rsa-sha3.go
similarity index 100%
rename from cmd/config/identity/openid/rsa-sha3.go
rename to legacy/config/identity/openid/rsa-sha3.go
diff --git a/cmd/config/identity/openid/validators.go b/legacy/config/identity/openid/validators.go
similarity index 100%
rename from cmd/config/identity/openid/validators.go
rename to legacy/config/identity/openid/validators.go
diff --git a/cmd/config/identity/openid/validators_test.go b/legacy/config/identity/openid/validators_test.go
similarity index 100%
rename from cmd/config/identity/openid/validators_test.go
rename to legacy/config/identity/openid/validators_test.go
diff --git a/cmd/config/legacy.go b/legacy/config/legacy.go
similarity index 100%
rename from cmd/config/legacy.go
rename to legacy/config/legacy.go
diff --git a/cmd/config/notify/config.go b/legacy/config/notify/config.go
similarity index 100%
rename from cmd/config/notify/config.go
rename to legacy/config/notify/config.go
diff --git a/cmd/config/notify/help.go b/legacy/config/notify/help.go
similarity index 99%
rename from cmd/config/notify/help.go
rename to legacy/config/notify/help.go
index 05f7d9a44..53c1dc13a 100644
--- a/cmd/config/notify/help.go
+++ b/legacy/config/notify/help.go
@@ -17,7 +17,7 @@
 package notify
 
 import (
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/event/target"
 )
 
diff --git a/cmd/config/notify/legacy.go b/legacy/config/notify/legacy.go
similarity index 99%
rename from cmd/config/notify/legacy.go
rename to legacy/config/notify/legacy.go
index 1c79965f5..c692c111b 100644
--- a/cmd/config/notify/legacy.go
+++ b/legacy/config/notify/legacy.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/event/target"
 )
 
diff --git a/cmd/config/notify/parse.go b/legacy/config/notify/parse.go
similarity index 99%
rename from cmd/config/notify/parse.go
rename to legacy/config/notify/parse.go
index 93f603d49..9adc5c8fb 100644
--- a/cmd/config/notify/parse.go
+++ b/legacy/config/notify/parse.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/event/target"
diff --git a/cmd/config/policy/opa/config.go b/legacy/config/policy/opa/config.go
similarity index 99%
rename from cmd/config/policy/opa/config.go
rename to legacy/config/policy/opa/config.go
index 05745e2c7..e4e777d6d 100644
--- a/cmd/config/policy/opa/config.go
+++ b/legacy/config/policy/opa/config.go
@@ -23,7 +23,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	xnet "github.com/minio/minio/pkg/net"
diff --git a/cmd/config/policy/opa/help.go b/legacy/config/policy/opa/help.go
similarity index 96%
rename from cmd/config/policy/opa/help.go
rename to legacy/config/policy/opa/help.go
index 7090b09b6..54cd707ad 100644
--- a/cmd/config/policy/opa/help.go
+++ b/legacy/config/policy/opa/help.go
@@ -16,7 +16,7 @@
 
 package opa
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for OPA policy feature.
 var (
diff --git a/cmd/config/policy/opa/legacy.go b/legacy/config/policy/opa/legacy.go
similarity index 96%
rename from cmd/config/policy/opa/legacy.go
rename to legacy/config/policy/opa/legacy.go
index 04ecb08a8..060c58c67 100644
--- a/cmd/config/policy/opa/legacy.go
+++ b/legacy/config/policy/opa/legacy.go
@@ -17,7 +17,7 @@
 package opa
 
 import (
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Legacy OPA envs
diff --git a/cmd/config/storageclass/help.go b/legacy/config/storageclass/help.go
similarity index 96%
rename from cmd/config/storageclass/help.go
rename to legacy/config/storageclass/help.go
index a7bf89620..eda5b3040 100644
--- a/cmd/config/storageclass/help.go
+++ b/legacy/config/storageclass/help.go
@@ -16,7 +16,7 @@
 
 package storageclass
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for storageclass feature.
 var (
diff --git a/cmd/config/storageclass/legacy.go b/legacy/config/storageclass/legacy.go
similarity index 96%
rename from cmd/config/storageclass/legacy.go
rename to legacy/config/storageclass/legacy.go
index 8059bf5a1..d52b9253a 100644
--- a/cmd/config/storageclass/legacy.go
+++ b/legacy/config/storageclass/legacy.go
@@ -17,7 +17,7 @@
 package storageclass
 
 import (
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // SetStorageClass - One time migration code needed, for migrating from older config to new for StorageClass.
diff --git a/cmd/config/storageclass/storage-class.go b/legacy/config/storageclass/storage-class.go
similarity index 99%
rename from cmd/config/storageclass/storage-class.go
rename to legacy/config/storageclass/storage-class.go
index 37e3e0faf..1d913849c 100644
--- a/cmd/config/storageclass/storage-class.go
+++ b/legacy/config/storageclass/storage-class.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/config/storageclass/storage-class_test.go b/legacy/config/storageclass/storage-class_test.go
similarity index 100%
rename from cmd/config/storageclass/storage-class_test.go
rename to legacy/config/storageclass/storage-class_test.go
diff --git a/cmd/consolelogger.go b/legacy/consolelogger.go
similarity index 95%
rename from cmd/consolelogger.go
rename to legacy/consolelogger.go
index 103a892d1..26ecc65ea 100644
--- a/cmd/consolelogger.go
+++ b/legacy/consolelogger.go
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	ring "container/ring"
 	"context"
 	"sync"
 
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
-	"github.com/minio/minio/cmd/logger/target/console"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
+	"github.com/minio/minio/legacy/logger/target/console"
 	xnet "github.com/minio/minio/pkg/net"
 	"github.com/minio/minio/pkg/pubsub"
 )
diff --git a/cmd/copy-part-range.go b/legacy/copy-part-range.go
similarity index 99%
rename from cmd/copy-part-range.go
rename to legacy/copy-part-range.go
index ed9eca390..c87a505f0 100644
--- a/cmd/copy-part-range.go
+++ b/legacy/copy-part-range.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/copy-part-range_test.go b/legacy/copy-part-range_test.go
similarity index 99%
rename from cmd/copy-part-range_test.go
rename to legacy/copy-part-range_test.go
index 1566e75c9..468dfd8c2 100644
--- a/cmd/copy-part-range_test.go
+++ b/legacy/copy-part-range_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "testing"
 
diff --git a/cmd/crossdomain-xml-handler.go b/legacy/crossdomain-xml-handler.go
similarity index 99%
rename from cmd/crossdomain-xml-handler.go
rename to legacy/crossdomain-xml-handler.go
index a6581036c..e20918c5d 100644
--- a/cmd/crossdomain-xml-handler.go
+++ b/legacy/crossdomain-xml-handler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "net/http"
 
diff --git a/cmd/crossdomain-xml-handler_test.go b/legacy/crossdomain-xml-handler_test.go
similarity index 98%
rename from cmd/crossdomain-xml-handler_test.go
rename to legacy/crossdomain-xml-handler_test.go
index 7bd53f4cb..45845184d 100644
--- a/cmd/crossdomain-xml-handler_test.go
+++ b/legacy/crossdomain-xml-handler_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/crypto/config.go b/legacy/crypto/config.go
similarity index 99%
rename from cmd/crypto/config.go
rename to legacy/crypto/config.go
index 81a79743c..034273af7 100644
--- a/cmd/crypto/config.go
+++ b/legacy/crypto/config.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/crypto/doc.go b/legacy/crypto/doc.go
similarity index 100%
rename from cmd/crypto/doc.go
rename to legacy/crypto/doc.go
diff --git a/cmd/crypto/error.go b/legacy/crypto/error.go
similarity index 100%
rename from cmd/crypto/error.go
rename to legacy/crypto/error.go
diff --git a/cmd/crypto/header.go b/legacy/crypto/header.go
similarity index 100%
rename from cmd/crypto/header.go
rename to legacy/crypto/header.go
diff --git a/cmd/crypto/header_test.go b/legacy/crypto/header_test.go
similarity index 100%
rename from cmd/crypto/header_test.go
rename to legacy/crypto/header_test.go
diff --git a/cmd/crypto/help.go b/legacy/crypto/help.go
similarity index 98%
rename from cmd/crypto/help.go
rename to legacy/crypto/help.go
index 8fa3c654d..64e5365c9 100644
--- a/cmd/crypto/help.go
+++ b/legacy/crypto/help.go
@@ -16,7 +16,7 @@
 
 package crypto
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for KMS vault
 var (
diff --git a/cmd/crypto/kes.go b/legacy/crypto/kes.go
similarity index 99%
rename from cmd/crypto/kes.go
rename to legacy/crypto/kes.go
index 10f3c0b8d..505e6ca8f 100644
--- a/cmd/crypto/kes.go
+++ b/legacy/crypto/kes.go
@@ -30,7 +30,7 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/crypto/key.go b/legacy/crypto/key.go
similarity index 99%
rename from cmd/crypto/key.go
rename to legacy/crypto/key.go
index f069159df..8c18995f1 100644
--- a/cmd/crypto/key.go
+++ b/legacy/crypto/key.go
@@ -24,7 +24,7 @@ import (
 	"io"
 	"path"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"github.com/minio/sio"
 )
diff --git a/cmd/crypto/key_test.go b/legacy/crypto/key_test.go
similarity index 99%
rename from cmd/crypto/key_test.go
rename to legacy/crypto/key_test.go
index f8059e29e..07aa7f8a5 100644
--- a/cmd/crypto/key_test.go
+++ b/legacy/crypto/key_test.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var shortRandom = func(limit int64) io.Reader { return io.LimitReader(rand.Reader, limit) }
diff --git a/cmd/crypto/kms.go b/legacy/crypto/kms.go
similarity index 99%
rename from cmd/crypto/kms.go
rename to legacy/crypto/kms.go
index cc7a097b9..3ba964afb 100644
--- a/cmd/crypto/kms.go
+++ b/legacy/crypto/kms.go
@@ -24,7 +24,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"github.com/minio/sio"
 )
diff --git a/cmd/crypto/kms_test.go b/legacy/crypto/kms_test.go
similarity index 100%
rename from cmd/crypto/kms_test.go
rename to legacy/crypto/kms_test.go
diff --git a/cmd/crypto/legacy.go b/legacy/crypto/legacy.go
similarity index 99%
rename from cmd/crypto/legacy.go
rename to legacy/crypto/legacy.go
index a074e160b..13b7c7096 100644
--- a/cmd/crypto/legacy.go
+++ b/legacy/crypto/legacy.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/crypto/metadata.go b/legacy/crypto/metadata.go
similarity index 99%
rename from cmd/crypto/metadata.go
rename to legacy/crypto/metadata.go
index ee0864bfd..a5922f210 100644
--- a/cmd/crypto/metadata.go
+++ b/legacy/crypto/metadata.go
@@ -19,7 +19,7 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // IsMultiPart returns true if the object metadata indicates
diff --git a/cmd/crypto/metadata_test.go b/legacy/crypto/metadata_test.go
similarity index 99%
rename from cmd/crypto/metadata_test.go
rename to legacy/crypto/metadata_test.go
index 828eea0b1..e38a6c4bc 100644
--- a/cmd/crypto/metadata_test.go
+++ b/legacy/crypto/metadata_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var isMultipartTests = []struct {
diff --git a/cmd/crypto/parse.go b/legacy/crypto/parse.go
similarity index 100%
rename from cmd/crypto/parse.go
rename to legacy/crypto/parse.go
diff --git a/cmd/crypto/parse_test.go b/legacy/crypto/parse_test.go
similarity index 100%
rename from cmd/crypto/parse_test.go
rename to legacy/crypto/parse_test.go
diff --git a/cmd/crypto/retry.go b/legacy/crypto/retry.go
similarity index 100%
rename from cmd/crypto/retry.go
rename to legacy/crypto/retry.go
diff --git a/cmd/crypto/sse.go b/legacy/crypto/sse.go
similarity index 99%
rename from cmd/crypto/sse.go
rename to legacy/crypto/sse.go
index 87adcc1e9..34ed3060a 100644
--- a/cmd/crypto/sse.go
+++ b/legacy/crypto/sse.go
@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"path"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/ioutil"
 	"github.com/minio/sio"
 )
diff --git a/cmd/crypto/sse_test.go b/legacy/crypto/sse_test.go
similarity index 100%
rename from cmd/crypto/sse_test.go
rename to legacy/crypto/sse_test.go
diff --git a/cmd/crypto/vault.go b/legacy/crypto/vault.go
similarity index 100%
rename from cmd/crypto/vault.go
rename to legacy/crypto/vault.go
diff --git a/cmd/crypto/vault_test.go b/legacy/crypto/vault_test.go
similarity index 100%
rename from cmd/crypto/vault_test.go
rename to legacy/crypto/vault_test.go
diff --git a/cmd/data-crawler.go b/legacy/data-crawler.go
similarity index 99%
rename from cmd/data-crawler.go
rename to legacy/data-crawler.go
index 46b1e405d..a5f1f27fb 100644
--- a/cmd/data-crawler.go
+++ b/legacy/data-crawler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,9 +27,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/env"
diff --git a/cmd/data-update-tracker.go b/legacy/data-update-tracker.go
similarity index 99%
rename from cmd/data-update-tracker.go
rename to legacy/data-update-tracker.go
index be96e133c..bb03e3c84 100644
--- a/cmd/data-update-tracker.go
+++ b/legacy/data-update-tracker.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -31,8 +31,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/env"
 	"github.com/willf/bloom"
diff --git a/cmd/data-update-tracker_test.go b/legacy/data-update-tracker_test.go
similarity index 98%
rename from cmd/data-update-tracker_test.go
rename to legacy/data-update-tracker_test.go
index 9af0c9d11..41de19a76 100644
--- a/cmd/data-update-tracker_test.go
+++ b/legacy/data-update-tracker_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,8 +28,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 )
 
 type testLoggerI interface {
diff --git a/cmd/data-usage-cache.go b/legacy/data-usage-cache.go
similarity index 99%
rename from cmd/data-usage-cache.go
rename to legacy/data-usage-cache.go
index 667a60a20..1522607ad 100644
--- a/cmd/data-usage-cache.go
+++ b/legacy/data-usage-cache.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -29,7 +29,7 @@ import (
 
 	"github.com/cespare/xxhash/v2"
 	"github.com/klauspost/compress/zstd"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/lifecycle"
 	"github.com/minio/minio/pkg/hash"
 	"github.com/tinylib/msgp/msgp"
diff --git a/cmd/data-usage-cache_gen.go b/legacy/data-usage-cache_gen.go
similarity index 99%
rename from cmd/data-usage-cache_gen.go
rename to legacy/data-usage-cache_gen.go
index be5cdd9cc..f0b59b461 100644
--- a/cmd/data-usage-cache_gen.go
+++ b/legacy/data-usage-cache_gen.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/data-usage-cache_gen_test.go b/legacy/data-usage-cache_gen_test.go
similarity index 99%
rename from cmd/data-usage-cache_gen_test.go
rename to legacy/data-usage-cache_gen_test.go
index 8922e16fa..b3cfc0a32 100644
--- a/cmd/data-usage-cache_gen_test.go
+++ b/legacy/data-usage-cache_gen_test.go
@@ -1,4 +1,4 @@
-package cmd
+package legacy
 
 // Code generated by github.com/tinylib/msgp DO NOT EDIT.
 
diff --git a/cmd/data-usage.go b/legacy/data-usage.go
similarity index 98%
rename from cmd/data-usage.go
rename to legacy/data-usage.go
index bcec9acb9..981061c2e 100644
--- a/cmd/data-usage.go
+++ b/legacy/data-usage.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -22,7 +22,7 @@ import (
 	"encoding/json"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/data-usage_test.go b/legacy/data-usage_test.go
similarity index 99%
rename from cmd/data-usage_test.go
rename to legacy/data-usage_test.go
index 5255459ee..3dd24b78b 100644
--- a/cmd/data-usage_test.go
+++ b/legacy/data-usage_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/disk-cache-backend.go b/legacy/disk-cache-backend.go
similarity index 99%
rename from cmd/disk-cache-backend.go
rename to legacy/disk-cache-backend.go
index 43b36446e..afd07b1dc 100644
--- a/cmd/disk-cache-backend.go
+++ b/legacy/disk-cache-backend.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -33,10 +33,10 @@ import (
 	"time"
 
 	"github.com/djherbis/atime"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/disk"
 	"github.com/minio/sio"
 )
diff --git a/cmd/disk-cache-check-support_other.go b/legacy/disk-cache-check-support_other.go
similarity index 98%
rename from cmd/disk-cache-check-support_other.go
rename to legacy/disk-cache-check-support_other.go
index f28b09cc3..c04f80d27 100644
--- a/cmd/disk-cache-check-support_other.go
+++ b/legacy/disk-cache-check-support_other.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/disk-cache-check-support_windows.go b/legacy/disk-cache-check-support_windows.go
similarity index 98%
rename from cmd/disk-cache-check-support_windows.go
rename to legacy/disk-cache-check-support_windows.go
index bf8ac21c7..7b3ce0e9d 100644
--- a/cmd/disk-cache-check-support_windows.go
+++ b/legacy/disk-cache-check-support_windows.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/disk-cache-stats.go b/legacy/disk-cache-stats.go
similarity index 99%
rename from cmd/disk-cache-stats.go
rename to legacy/disk-cache-stats.go
index 2cf15fa2d..4b988098d 100644
--- a/cmd/disk-cache-stats.go
+++ b/legacy/disk-cache-stats.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"sync/atomic"
diff --git a/cmd/disk-cache-utils.go b/legacy/disk-cache-utils.go
similarity index 99%
rename from cmd/disk-cache-utils.go
rename to legacy/disk-cache-utils.go
index 6a11a8827..f880c7dbd 100644
--- a/cmd/disk-cache-utils.go
+++ b/legacy/disk-cache-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"container/list"
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // CacheStatusType - whether the request was served from cache.
diff --git a/cmd/disk-cache-utils_test.go b/legacy/disk-cache-utils_test.go
similarity index 99%
rename from cmd/disk-cache-utils_test.go
rename to legacy/disk-cache-utils_test.go
index 8de7b4551..c2e577d12 100644
--- a/cmd/disk-cache-utils_test.go
+++ b/legacy/disk-cache-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/disk-cache.go b/legacy/disk-cache.go
similarity index 99%
rename from cmd/disk-cache.go
rename to legacy/disk-cache.go
index e66a5428a..290c5363b 100644
--- a/cmd/disk-cache.go
+++ b/legacy/disk-cache.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -27,8 +27,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/sync/errgroup"
diff --git a/cmd/disk-cache_test.go b/legacy/disk-cache_test.go
similarity index 99%
rename from cmd/disk-cache_test.go
rename to legacy/disk-cache_test.go
index 1a35d180b..c481cd797 100644
--- a/cmd/disk-cache_test.go
+++ b/legacy/disk-cache_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/dummy-data-generator_test.go b/legacy/dummy-data-generator_test.go
similarity index 99%
rename from cmd/dummy-data-generator_test.go
rename to legacy/dummy-data-generator_test.go
index 052d852f5..b38057c6d 100644
--- a/cmd/dummy-data-generator_test.go
+++ b/legacy/dummy-data-generator_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/dummy-handlers.go b/legacy/dummy-handlers.go
similarity index 99%
rename from cmd/dummy-handlers.go
rename to legacy/dummy-handlers.go
index 2d33e7182..f89e33429 100644
--- a/cmd/dummy-handlers.go
+++ b/legacy/dummy-handlers.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/dynamic-timeouts.go b/legacy/dynamic-timeouts.go
similarity index 99%
rename from cmd/dynamic-timeouts.go
rename to legacy/dynamic-timeouts.go
index 41161410b..b3352abfd 100644
--- a/cmd/dynamic-timeouts.go
+++ b/legacy/dynamic-timeouts.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"sync"
diff --git a/cmd/dynamic-timeouts_test.go b/legacy/dynamic-timeouts_test.go
similarity index 99%
rename from cmd/dynamic-timeouts_test.go
rename to legacy/dynamic-timeouts_test.go
index 699c7f8af..04ef47076 100644
--- a/cmd/dynamic-timeouts_test.go
+++ b/legacy/dynamic-timeouts_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"math/rand"
diff --git a/cmd/encryption-v1.go b/legacy/encryption-v1.go
similarity index 99%
rename from cmd/encryption-v1.go
rename to legacy/encryption-v1.go
index 789f40e5e..ace958a87 100644
--- a/cmd/encryption-v1.go
+++ b/legacy/encryption-v1.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -32,8 +32,8 @@ import (
 	"strings"
 
 	"github.com/minio/minio-go/v6/pkg/encrypt"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	sha256 "github.com/minio/sha256-simd"
 	"github.com/minio/sio"
 )
diff --git a/cmd/encryption-v1_test.go b/legacy/encryption-v1_test.go
similarity index 99%
rename from cmd/encryption-v1_test.go
rename to legacy/encryption-v1_test.go
index 75ca56ac7..f785aa231 100644
--- a/cmd/encryption-v1_test.go
+++ b/legacy/encryption-v1_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -24,7 +24,7 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/minio/minio-go/v6/pkg/encrypt"
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 	"github.com/minio/sio"
 )
 
diff --git a/cmd/endpoint-ellipses.go b/legacy/endpoint-ellipses.go
similarity index 99%
rename from cmd/endpoint-ellipses.go
rename to legacy/endpoint-ellipses.go
index 92e8b224b..020363964 100644
--- a/cmd/endpoint-ellipses.go
+++ b/legacy/endpoint-ellipses.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/ellipses"
 	"github.com/minio/minio/pkg/env"
 )
diff --git a/cmd/endpoint-ellipses_test.go b/legacy/endpoint-ellipses_test.go
similarity index 99%
rename from cmd/endpoint-ellipses_test.go
rename to legacy/endpoint-ellipses_test.go
index 14cf07f71..ef88e5480 100644
--- a/cmd/endpoint-ellipses_test.go
+++ b/legacy/endpoint-ellipses_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/endpoint.go b/legacy/endpoint.go
similarity index 99%
rename from cmd/endpoint.go
rename to legacy/endpoint.go
index 9a3e4dc52..b240f038e 100644
--- a/cmd/endpoint.go
+++ b/legacy/endpoint.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
@@ -29,8 +29,8 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/mountinfo"
 )
diff --git a/cmd/endpoint_test.go b/legacy/endpoint_test.go
similarity index 99%
rename from cmd/endpoint_test.go
rename to legacy/endpoint_test.go
index e562211b4..620951bc7 100644
--- a/cmd/endpoint_test.go
+++ b/legacy/endpoint_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/erasure-decode.go b/legacy/erasure-decode.go
similarity index 99%
rename from cmd/erasure-decode.go
rename to legacy/erasure-decode.go
index eddc55f6d..f2e43eb2b 100644
--- a/cmd/erasure-decode.go
+++ b/legacy/erasure-decode.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var errHealRequired = errors.New("heal required")
diff --git a/cmd/erasure-decode_test.go b/legacy/erasure-decode_test.go
similarity index 99%
rename from cmd/erasure-decode_test.go
rename to legacy/erasure-decode_test.go
index f168b3cb1..6a975f208 100644
--- a/cmd/erasure-decode_test.go
+++ b/legacy/erasure-decode_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/erasure-encode.go b/legacy/erasure-encode.go
similarity index 98%
rename from cmd/erasure-encode.go
rename to legacy/erasure-encode.go
index f263b579d..b829b7da8 100644
--- a/cmd/erasure-encode.go
+++ b/legacy/erasure-encode.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 
 	"sync"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Writes in parallel to writers
diff --git a/cmd/erasure-encode_test.go b/legacy/erasure-encode_test.go
similarity index 99%
rename from cmd/erasure-encode_test.go
rename to legacy/erasure-encode_test.go
index 8fbe2da70..115fd09bb 100644
--- a/cmd/erasure-encode_test.go
+++ b/legacy/erasure-encode_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/erasure-heal.go b/legacy/erasure-heal.go
similarity index 96%
rename from cmd/erasure-heal.go
rename to legacy/erasure-heal.go
index 947416abf..b1b124aac 100644
--- a/cmd/erasure-heal.go
+++ b/legacy/erasure-heal.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"io"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Heal heals the shard files on non-nil writers. Note that the quorum passed is 1
diff --git a/cmd/erasure-heal_test.go b/legacy/erasure-heal_test.go
similarity index 99%
rename from cmd/erasure-heal_test.go
rename to legacy/erasure-heal_test.go
index 5ab0e23db..60349214a 100644
--- a/cmd/erasure-heal_test.go
+++ b/legacy/erasure-heal_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/erasure-utils.go b/legacy/erasure-utils.go
similarity index 98%
rename from cmd/erasure-utils.go
rename to legacy/erasure-utils.go
index 2f844da87..5d026cfe1 100644
--- a/cmd/erasure-utils.go
+++ b/legacy/erasure-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/klauspost/reedsolomon"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // getDataBlockLen - get length of data blocks from encoded blocks.
diff --git a/cmd/erasure.go b/legacy/erasure.go
similarity index 98%
rename from cmd/erasure.go
rename to legacy/erasure.go
index 4a6f31a6a..1dfaf4fca 100644
--- a/cmd/erasure.go
+++ b/legacy/erasure.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"sync"
 
 	"github.com/klauspost/reedsolomon"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Erasure - erasure encoding details.
diff --git a/cmd/erasure_test.go b/legacy/erasure_test.go
similarity index 99%
rename from cmd/erasure_test.go
rename to legacy/erasure_test.go
index 4caa6f53c..2064bfa73 100644
--- a/cmd/erasure_test.go
+++ b/legacy/erasure_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/etcd.go b/legacy/etcd.go
similarity index 99%
rename from cmd/etcd.go
rename to legacy/etcd.go
index d3cc83a13..8dcaff2d1 100644
--- a/cmd/etcd.go
+++ b/legacy/etcd.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/fallocate.go b/legacy/fallocate.go
similarity index 98%
rename from cmd/fallocate.go
rename to legacy/fallocate.go
index 67046cae0..8d3372838 100644
--- a/cmd/fallocate.go
+++ b/legacy/fallocate.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // Fallocate is not POSIX and not supported under Windows
 // Always return successful
diff --git a/cmd/fallocate_linux.go b/legacy/fallocate_linux.go
similarity index 98%
rename from cmd/fallocate_linux.go
rename to legacy/fallocate_linux.go
index 89ea8eecb..575fec2d7 100644
--- a/cmd/fallocate_linux.go
+++ b/legacy/fallocate_linux.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/fallocate_linux_test.go b/legacy/fallocate_linux_test.go
similarity index 98%
rename from cmd/fallocate_linux_test.go
rename to legacy/fallocate_linux_test.go
index ee95f2130..3f8d1a404 100644
--- a/cmd/fallocate_linux_test.go
+++ b/legacy/fallocate_linux_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "testing"
 
diff --git a/cmd/fastwalk.go b/legacy/fastwalk.go
similarity index 98%
rename from cmd/fastwalk.go
rename to legacy/fastwalk.go
index 2096982e6..14d6a0141 100644
--- a/cmd/fastwalk.go
+++ b/legacy/fastwalk.go
@@ -6,7 +6,7 @@
 // only fastwalk.go is imported since we already implement readDir()
 // with some little tweaks.
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/format-disk-cache.go b/legacy/format-disk-cache.go
similarity index 99%
rename from cmd/format-disk-cache.go
rename to legacy/format-disk-cache.go
index 3dec6e56a..8636b90ea 100644
--- a/cmd/format-disk-cache.go
+++ b/legacy/format-disk-cache.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"strings"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/sio"
 )
 
diff --git a/cmd/format-disk-cache_test.go b/legacy/format-disk-cache_test.go
similarity index 99%
rename from cmd/format-disk-cache_test.go
rename to legacy/format-disk-cache_test.go
index 9e64674e4..a6f43760b 100644
--- a/cmd/format-disk-cache_test.go
+++ b/legacy/format-disk-cache_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/format-fs.go b/legacy/format-fs.go
similarity index 99%
rename from cmd/format-fs.go
rename to legacy/format-fs.go
index 1fab6dc62..9db020b82 100644
--- a/cmd/format-fs.go
+++ b/legacy/format-fs.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,8 +24,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 	"github.com/minio/minio/pkg/retry"
 )
diff --git a/cmd/format-fs_test.go b/legacy/format-fs_test.go
similarity index 99%
rename from cmd/format-fs_test.go
rename to legacy/format-fs_test.go
index dc9f187d9..4dc0ce44c 100644
--- a/cmd/format-fs_test.go
+++ b/legacy/format-fs_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/format-meta.go b/legacy/format-meta.go
similarity index 99%
rename from cmd/format-meta.go
rename to legacy/format-meta.go
index 8c42fd370..119abf57e 100644
--- a/cmd/format-meta.go
+++ b/legacy/format-meta.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // Format related consts
 const (
diff --git a/cmd/format-xl.go b/legacy/format-xl.go
similarity index 99%
rename from cmd/format-xl.go
rename to legacy/format-xl.go
index 8d7ad9f24..50bb6d71f 100644
--- a/cmd/format-xl.go
+++ b/legacy/format-xl.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,9 +27,9 @@ import (
 	"sync"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/sync/errgroup"
 	sha256 "github.com/minio/sha256-simd"
diff --git a/cmd/format-xl_test.go b/legacy/format-xl_test.go
similarity index 99%
rename from cmd/format-xl_test.go
rename to legacy/format-xl_test.go
index 10f5adde8..88534f021 100644
--- a/cmd/format-xl_test.go
+++ b/legacy/format-xl_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
diff --git a/cmd/fs-v1-helpers.go b/legacy/fs-v1-helpers.go
similarity index 99%
rename from cmd/fs-v1-helpers.go
rename to legacy/fs-v1-helpers.go
index b312a5a92..2df5d4b4e 100644
--- a/cmd/fs-v1-helpers.go
+++ b/legacy/fs-v1-helpers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	pathutil "path"
 	"runtime"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 )
 
diff --git a/cmd/fs-v1-helpers_test.go b/legacy/fs-v1-helpers_test.go
similarity index 99%
rename from cmd/fs-v1-helpers_test.go
rename to legacy/fs-v1-helpers_test.go
index 972616ce2..37babce4e 100644
--- a/cmd/fs-v1-helpers_test.go
+++ b/legacy/fs-v1-helpers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/fs-v1-metadata.go b/legacy/fs-v1-metadata.go
similarity index 98%
rename from cmd/fs-v1-metadata.go
rename to legacy/fs-v1-metadata.go
index b1e108ae8..0e097cabf 100644
--- a/cmd/fs-v1-metadata.go
+++ b/legacy/fs-v1-metadata.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 	"github.com/minio/minio/pkg/mimedb"
 )
diff --git a/cmd/fs-v1-metadata_test.go b/legacy/fs-v1-metadata_test.go
similarity index 99%
rename from cmd/fs-v1-metadata_test.go
rename to legacy/fs-v1-metadata_test.go
index 1d8cb7ba5..094756955 100644
--- a/cmd/fs-v1-metadata_test.go
+++ b/legacy/fs-v1-metadata_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/fs-v1-multipart.go b/legacy/fs-v1-multipart.go
similarity index 99%
rename from cmd/fs-v1-multipart.go
rename to legacy/fs-v1-multipart.go
index 9cf8c3755..e0d0b2d5e 100644
--- a/cmd/fs-v1-multipart.go
+++ b/legacy/fs-v1-multipart.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	mioutil "github.com/minio/minio/pkg/ioutil"
 )
 
diff --git a/cmd/fs-v1-multipart_test.go b/legacy/fs-v1-multipart_test.go
similarity index 99%
rename from cmd/fs-v1-multipart_test.go
rename to legacy/fs-v1-multipart_test.go
index 91d947f55..191e77660 100644
--- a/cmd/fs-v1-multipart_test.go
+++ b/legacy/fs-v1-multipart_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/fs-v1-rwpool.go b/legacy/fs-v1-rwpool.go
similarity index 99%
rename from cmd/fs-v1-rwpool.go
rename to legacy/fs-v1-rwpool.go
index 6c5eb1be1..74325efc1 100644
--- a/cmd/fs-v1-rwpool.go
+++ b/legacy/fs-v1-rwpool.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
 	pathutil "path"
 	"sync"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/lock"
 )
 
diff --git a/cmd/fs-v1-rwpool_test.go b/legacy/fs-v1-rwpool_test.go
similarity index 99%
rename from cmd/fs-v1-rwpool_test.go
rename to legacy/fs-v1-rwpool_test.go
index f648ab852..304af2f92 100644
--- a/cmd/fs-v1-rwpool_test.go
+++ b/legacy/fs-v1-rwpool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/fs-v1.go b/legacy/fs-v1.go
similarity index 99%
rename from cmd/fs-v1.go
rename to legacy/fs-v1.go
index 99f292b88..df721b780 100644
--- a/cmd/fs-v1.go
+++ b/legacy/fs-v1.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -35,9 +35,9 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/lock"
diff --git a/cmd/fs-v1_test.go b/legacy/fs-v1_test.go
similarity index 99%
rename from cmd/fs-v1_test.go
rename to legacy/fs-v1_test.go
index 62da095fc..50a02aee5 100644
--- a/cmd/fs-v1_test.go
+++ b/legacy/fs-v1_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/gateway-common.go b/legacy/gateway-common.go
similarity index 98%
rename from cmd/gateway-common.go
rename to legacy/gateway-common.go
index 0c31952f3..75509b273 100644
--- a/cmd/gateway-common.go
+++ b/legacy/gateway-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/minio/minio/pkg/hash"
 	xnet "github.com/minio/minio/pkg/net"
diff --git a/cmd/gateway-common_test.go b/legacy/gateway-common_test.go
similarity index 98%
rename from cmd/gateway-common_test.go
rename to legacy/gateway-common_test.go
index 6bb14c7db..61b1dbc1f 100644
--- a/cmd/gateway-common_test.go
+++ b/legacy/gateway-common_test.go
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cmd
+package legacy
 
 import (
 	"reflect"
diff --git a/cmd/gateway-env.go b/legacy/gateway-env.go
similarity index 98%
rename from cmd/gateway-env.go
rename to legacy/gateway-env.go
index 5337de4d5..e3a823df8 100644
--- a/cmd/gateway-env.go
+++ b/legacy/gateway-env.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 type gatewaySSE []string
 
diff --git a/cmd/gateway-interface.go b/legacy/gateway-interface.go
similarity index 98%
rename from cmd/gateway-interface.go
rename to legacy/gateway-interface.go
index 4b92dcc3c..22caf49c3 100644
--- a/cmd/gateway-interface.go
+++ b/legacy/gateway-interface.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"github.com/minio/minio/pkg/auth"
diff --git a/cmd/gateway-main.go b/legacy/gateway-main.go
similarity index 98%
rename from cmd/gateway-main.go
rename to legacy/gateway-main.go
index 7500e715d..6e1dbd846 100644
--- a/cmd/gateway-main.go
+++ b/legacy/gateway-main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,9 +28,9 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/minio/cli"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/env"
diff --git a/cmd/gateway-main_test.go b/legacy/gateway-main_test.go
similarity index 99%
rename from cmd/gateway-main_test.go
rename to legacy/gateway-main_test.go
index ddef8f744..dd45fe976 100644
--- a/cmd/gateway-main_test.go
+++ b/legacy/gateway-main_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/gateway-metrics.go b/legacy/gateway-metrics.go
similarity index 99%
rename from cmd/gateway-metrics.go
rename to legacy/gateway-metrics.go
index 3f9746fa3..41da771d3 100644
--- a/cmd/gateway-metrics.go
+++ b/legacy/gateway-metrics.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/gateway-startup-msg.go b/legacy/gateway-startup-msg.go
similarity index 99%
rename from cmd/gateway-startup-msg.go
rename to legacy/gateway-startup-msg.go
index 4ac915fee..17d6b898a 100644
--- a/cmd/gateway-startup-msg.go
+++ b/legacy/gateway-startup-msg.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/gateway-startup-msg_test.go b/legacy/gateway-startup-msg_test.go
similarity index 98%
rename from cmd/gateway-startup-msg_test.go
rename to legacy/gateway-startup-msg_test.go
index 0bb1734ca..55da9801b 100644
--- a/cmd/gateway-startup-msg_test.go
+++ b/legacy/gateway-startup-msg_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/gateway-unsupported.go b/legacy/gateway-unsupported.go
similarity index 99%
rename from cmd/gateway-unsupported.go
rename to legacy/gateway-unsupported.go
index a860a5e11..51dad75d3 100644
--- a/cmd/gateway-unsupported.go
+++ b/legacy/gateway-unsupported.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"errors"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
 	bucketsse "github.com/minio/minio/pkg/bucket/encryption"
diff --git a/cmd/generic-handlers.go b/legacy/generic-handlers.go
similarity index 99%
rename from cmd/generic-handlers.go
rename to legacy/generic-handlers.go
index 0b07ac62f..8d2984491 100644
--- a/cmd/generic-handlers.go
+++ b/legacy/generic-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -24,11 +24,11 @@ import (
 	"github.com/minio/minio-go/v6/pkg/set"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/http/stats"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/http/stats"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 	"github.com/minio/minio/pkg/wildcard"
 	"github.com/rs/cors"
diff --git a/cmd/generic-handlers_test.go b/legacy/generic-handlers_test.go
similarity index 99%
rename from cmd/generic-handlers_test.go
rename to legacy/generic-handlers_test.go
index b91ce282c..b1a18dbeb 100644
--- a/cmd/generic-handlers_test.go
+++ b/legacy/generic-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // Tests getRedirectLocation function for all its criteria.
diff --git a/cmd/global-heal.go b/legacy/global-heal.go
similarity index 99%
rename from cmd/global-heal.go
rename to legacy/global-heal.go
index 8904ecacc..b80435aaf 100644
--- a/cmd/global-heal.go
+++ b/legacy/global-heal.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/globals.go b/legacy/globals.go
similarity index 95%
rename from cmd/globals.go
rename to legacy/globals.go
index fae732fc9..fbb23add9 100644
--- a/cmd/globals.go
+++ b/legacy/globals.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -25,15 +25,15 @@ import (
 
 	etcd "github.com/coreos/etcd/clientv3"
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config/cache"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	xldap "github.com/minio/minio/cmd/config/identity/ldap"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/config/policy/opa"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/config/cache"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	xldap "github.com/minio/minio/legacy/config/identity/ldap"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/config/policy/opa"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/auth"
 
 	"github.com/minio/minio/pkg/certs"
diff --git a/cmd/handler-api.go b/legacy/handler-api.go
similarity index 97%
rename from cmd/handler-api.go
rename to legacy/handler-api.go
index f946a4391..324652b6d 100644
--- a/cmd/handler-api.go
+++ b/legacy/handler-api.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/config/api"
+	"github.com/minio/minio/legacy/config/api"
 )
 
 type apiConfig struct {
diff --git a/cmd/handler-utils.go b/legacy/handler-utils.go
similarity index 99%
rename from cmd/handler-utils.go
rename to legacy/handler-utils.go
index 1599e3544..72b17db57 100644
--- a/cmd/handler-utils.go
+++ b/legacy/handler-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,8 +30,8 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/handlers"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/handler-utils_test.go b/legacy/handler-utils_test.go
similarity index 99%
rename from cmd/handler-utils_test.go
rename to legacy/handler-utils_test.go
index a519cbad1..8d4c86b4d 100644
--- a/cmd/handler-utils_test.go
+++ b/legacy/handler-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 )
 
 // Tests validate bucket LocationConstraint.
diff --git a/cmd/hasher.go b/legacy/hasher.go
similarity index 98%
rename from cmd/hasher.go
rename to legacy/hasher.go
index bac821eab..e6b6e435a 100644
--- a/cmd/hasher.go
+++ b/legacy/hasher.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/md5"
diff --git a/cmd/healthcheck-handler.go b/legacy/healthcheck-handler.go
similarity index 99%
rename from cmd/healthcheck-handler.go
rename to legacy/healthcheck-handler.go
index 859184653..c3f39af04 100644
--- a/cmd/healthcheck-handler.go
+++ b/legacy/healthcheck-handler.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/healthcheck-router.go b/legacy/healthcheck-router.go
similarity index 99%
rename from cmd/healthcheck-router.go
rename to legacy/healthcheck-router.go
index cb4a6ad0f..4f3f95c63 100644
--- a/cmd/healthcheck-router.go
+++ b/legacy/healthcheck-router.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/http-stats.go b/legacy/http-stats.go
similarity index 98%
rename from cmd/http-stats.go
rename to legacy/http-stats.go
index ec88f2822..f167038ff 100644
--- a/cmd/http-stats.go
+++ b/legacy/http-stats.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/cmd/http-tracer.go b/legacy/http-tracer.go
similarity index 97%
rename from cmd/http-tracer.go
rename to legacy/http-tracer.go
index 01ac76a26..73fa21174 100644
--- a/cmd/http-tracer.go
+++ b/legacy/http-tracer.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 	trace "github.com/minio/minio/pkg/trace"
 )
@@ -80,7 +80,7 @@ func (r *recordRequest) Data() []byte {
 
 // getOpName sanitizes the operation name for mc
 func getOpName(name string) (op string) {
-	op = strings.TrimPrefix(name, "github.com/minio/minio/cmd.")
+	op = strings.TrimPrefix(name, "github.com/minio/minio/legacy.")
 	op = strings.TrimSuffix(op, "Handler-fm")
 	op = strings.Replace(op, "objectAPIHandlers", "s3", 1)
 	op = strings.Replace(op, "webAPIHandlers", "webui", 1)
diff --git a/cmd/http/close.go b/legacy/http/close.go
similarity index 100%
rename from cmd/http/close.go
rename to legacy/http/close.go
diff --git a/cmd/http/dial_linux.go b/legacy/http/dial_linux.go
similarity index 100%
rename from cmd/http/dial_linux.go
rename to legacy/http/dial_linux.go
diff --git a/cmd/http/dial_others.go b/legacy/http/dial_others.go
similarity index 100%
rename from cmd/http/dial_others.go
rename to legacy/http/dial_others.go
diff --git a/cmd/http/headers.go b/legacy/http/headers.go
similarity index 100%
rename from cmd/http/headers.go
rename to legacy/http/headers.go
diff --git a/cmd/http/listen_nix.go b/legacy/http/listen_nix.go
similarity index 100%
rename from cmd/http/listen_nix.go
rename to legacy/http/listen_nix.go
diff --git a/cmd/http/listen_others.go b/legacy/http/listen_others.go
similarity index 100%
rename from cmd/http/listen_others.go
rename to legacy/http/listen_others.go
diff --git a/cmd/http/listener.go b/legacy/http/listener.go
similarity index 100%
rename from cmd/http/listener.go
rename to legacy/http/listener.go
diff --git a/cmd/http/listener_test.go b/legacy/http/listener_test.go
similarity index 100%
rename from cmd/http/listener_test.go
rename to legacy/http/listener_test.go
diff --git a/cmd/http/server.go b/legacy/http/server.go
similarity index 100%
rename from cmd/http/server.go
rename to legacy/http/server.go
diff --git a/cmd/http/server_test.go b/legacy/http/server_test.go
similarity index 100%
rename from cmd/http/server_test.go
rename to legacy/http/server_test.go
diff --git a/cmd/http/stats/http-traffic-recorder.go b/legacy/http/stats/http-traffic-recorder.go
similarity index 100%
rename from cmd/http/stats/http-traffic-recorder.go
rename to legacy/http/stats/http-traffic-recorder.go
diff --git a/cmd/httprange.go b/legacy/httprange.go
similarity index 99%
rename from cmd/httprange.go
rename to legacy/httprange.go
index 145e54f69..715ba0b72 100644
--- a/cmd/httprange.go
+++ b/legacy/httprange.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/httprange_test.go b/legacy/httprange_test.go
similarity index 99%
rename from cmd/httprange_test.go
rename to legacy/httprange_test.go
index ee0b9a5fe..dfb036171 100644
--- a/cmd/httprange_test.go
+++ b/legacy/httprange_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/iam-etcd-store.go b/legacy/iam-etcd-store.go
similarity index 99%
rename from cmd/iam-etcd-store.go
rename to legacy/iam-etcd-store.go
index 4c2f20fbf..02238e578 100644
--- a/cmd/iam-etcd-store.go
+++ b/legacy/iam-etcd-store.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,7 +30,7 @@ import (
 	"github.com/coreos/etcd/mvcc/mvccpb"
 	jwtgo "github.com/dgrijalva/jwt-go"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/iam-object-store.go b/legacy/iam-object-store.go
similarity index 99%
rename from cmd/iam-object-store.go
rename to legacy/iam-object-store.go
index b27d1ad18..05ed3aed9 100644
--- a/cmd/iam-object-store.go
+++ b/legacy/iam-object-store.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,7 +27,7 @@ import (
 
 	jwtgo "github.com/dgrijalva/jwt-go"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/iam.go b/legacy/iam.go
similarity index 99%
rename from cmd/iam.go
rename to legacy/iam.go
index 18081ae68..8a7b26e64 100644
--- a/cmd/iam.go
+++ b/legacy/iam.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -27,8 +27,8 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/jwt.go b/legacy/jwt.go
similarity index 98%
rename from cmd/jwt.go
rename to legacy/jwt.go
index 63af66cc4..0a0e38b78 100644
--- a/cmd/jwt.go
+++ b/legacy/jwt.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -23,8 +23,8 @@ import (
 
 	jwtgo "github.com/dgrijalva/jwt-go"
 	jwtreq "github.com/dgrijalva/jwt-go/request"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 )
 
diff --git a/cmd/jwt/parser.go b/legacy/jwt/parser.go
similarity index 100%
rename from cmd/jwt/parser.go
rename to legacy/jwt/parser.go
diff --git a/cmd/jwt/parser_test.go b/legacy/jwt/parser_test.go
similarity index 100%
rename from cmd/jwt/parser_test.go
rename to legacy/jwt/parser_test.go
diff --git a/cmd/jwt_test.go b/legacy/jwt_test.go
similarity index 98%
rename from cmd/jwt_test.go
rename to legacy/jwt_test.go
index 685d7afcb..71006605b 100644
--- a/cmd/jwt_test.go
+++ b/legacy/jwt_test.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"os"
 	"testing"
 
-	xjwt "github.com/minio/minio/cmd/jwt"
+	xjwt "github.com/minio/minio/legacy/jwt"
 	"github.com/minio/minio/pkg/auth"
 )
 
diff --git a/cmd/leak-detect_test.go b/legacy/leak-detect_test.go
similarity index 99%
rename from cmd/leak-detect_test.go
rename to legacy/leak-detect_test.go
index ca1aa42b8..ce9abc8f3 100644
--- a/cmd/leak-detect_test.go
+++ b/legacy/leak-detect_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package cmd
+package legacy
 
 import (
 	"runtime/debug"
diff --git a/cmd/local-locker.go b/legacy/local-locker.go
similarity index 99%
rename from cmd/local-locker.go
rename to legacy/local-locker.go
index 707613e26..6bbc7407f 100644
--- a/cmd/local-locker.go
+++ b/legacy/local-locker.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/lock-rest-client.go b/legacy/lock-rest-client.go
similarity index 96%
rename from cmd/lock-rest-client.go
rename to legacy/lock-rest-client.go
index 61e99377f..ddf58a490 100644
--- a/cmd/lock-rest-client.go
+++ b/legacy/lock-rest-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -24,10 +24,10 @@ import (
 	"io"
 	"net/url"
 
-	"github.com/minio/minio/cmd/http"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/http"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	"github.com/minio/minio/pkg/dsync"
 )
 
diff --git a/cmd/lock-rest-client_test.go b/legacy/lock-rest-client_test.go
similarity index 98%
rename from cmd/lock-rest-client_test.go
rename to legacy/lock-rest-client_test.go
index d05659ccd..116f10bc9 100644
--- a/cmd/lock-rest-client_test.go
+++ b/legacy/lock-rest-client_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/lock-rest-server-common.go b/legacy/lock-rest-server-common.go
similarity index 98%
rename from cmd/lock-rest-server-common.go
rename to legacy/lock-rest-server-common.go
index 15b10e575..3d0639032 100644
--- a/cmd/lock-rest-server-common.go
+++ b/legacy/lock-rest-server-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/lock-rest-server-common_test.go b/legacy/lock-rest-server-common_test.go
similarity index 99%
rename from cmd/lock-rest-server-common_test.go
rename to legacy/lock-rest-server-common_test.go
index 150027b2a..55c190171 100644
--- a/cmd/lock-rest-server-common_test.go
+++ b/legacy/lock-rest-server-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/lock-rest-server.go b/legacy/lock-rest-server.go
similarity index 99%
rename from cmd/lock-rest-server.go
rename to legacy/lock-rest-server.go
index 857f37d93..ba1acdfb1 100644
--- a/cmd/lock-rest-server.go
+++ b/legacy/lock-rest-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
diff --git a/cmd/logger/audit.go b/legacy/logger/audit.go
similarity index 98%
rename from cmd/logger/audit.go
rename to legacy/logger/audit.go
index 9883f9f05..0ccd17e84 100644
--- a/cmd/logger/audit.go
+++ b/legacy/logger/audit.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger/message/audit"
+	"github.com/minio/minio/legacy/logger/message/audit"
 )
 
 // ResponseWriter - is a wrapper to trap the http response status code.
diff --git a/cmd/logger/config.go b/legacy/logger/config.go
similarity index 99%
rename from cmd/logger/config.go
rename to legacy/logger/config.go
index dc520f832..ae3ddd67d 100644
--- a/cmd/logger/config.go
+++ b/legacy/logger/config.go
@@ -19,7 +19,7 @@ package logger
 import (
 	"strings"
 
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/cmd/logger/console.go b/legacy/logger/console.go
similarity index 98%
rename from cmd/logger/console.go
rename to legacy/logger/console.go
index 5ea222540..e292c2d91 100644
--- a/cmd/logger/console.go
+++ b/legacy/logger/console.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/color"
 	c "github.com/minio/minio/pkg/console"
 )
diff --git a/cmd/logger/help.go b/legacy/logger/help.go
similarity index 97%
rename from cmd/logger/help.go
rename to legacy/logger/help.go
index e625c4cca..451ca7609 100644
--- a/cmd/logger/help.go
+++ b/legacy/logger/help.go
@@ -16,7 +16,7 @@
 
 package logger
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Help template for logger http and audit
 var (
diff --git a/cmd/logger/legacy.go b/legacy/logger/legacy.go
similarity index 97%
rename from cmd/logger/legacy.go
rename to legacy/logger/legacy.go
index 0d37a665d..2a3ac46b9 100644
--- a/cmd/logger/legacy.go
+++ b/legacy/logger/legacy.go
@@ -16,7 +16,7 @@
 
 package logger
 
-import "github.com/minio/minio/cmd/config"
+import "github.com/minio/minio/legacy/config"
 
 // Legacy envs
 const (
diff --git a/cmd/logger/logger.go b/legacy/logger/logger.go
similarity index 99%
rename from cmd/logger/logger.go
rename to legacy/logger/logger.go
index 8ecbbb6ea..47d363c8b 100644
--- a/cmd/logger/logger.go
+++ b/legacy/logger/logger.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/minio/highwayhash"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger/message/log"
 )
 
 var (
diff --git a/cmd/logger/logonce.go b/legacy/logger/logonce.go
similarity index 100%
rename from cmd/logger/logonce.go
rename to legacy/logger/logonce.go
diff --git a/cmd/logger/message/audit/entry.go b/legacy/logger/message/audit/entry.go
similarity index 98%
rename from cmd/logger/message/audit/entry.go
rename to legacy/logger/message/audit/entry.go
index 7f9fff339..f1c7a9647 100644
--- a/cmd/logger/message/audit/entry.go
+++ b/legacy/logger/message/audit/entry.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/handlers"
 )
 
diff --git a/cmd/logger/message/log/entry.go b/legacy/logger/message/log/entry.go
similarity index 100%
rename from cmd/logger/message/log/entry.go
rename to legacy/logger/message/log/entry.go
diff --git a/cmd/logger/reqinfo.go b/legacy/logger/reqinfo.go
similarity index 100%
rename from cmd/logger/reqinfo.go
rename to legacy/logger/reqinfo.go
diff --git a/cmd/logger/target/console/console.go b/legacy/logger/target/console/console.go
similarity index 97%
rename from cmd/logger/target/console/console.go
rename to legacy/logger/target/console/console.go
index 74e0c7b2b..042f9c2de 100644
--- a/cmd/logger/target/console/console.go
+++ b/legacy/logger/target/console/console.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/logger/message/log"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/logger/message/log"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/console"
 )
diff --git a/cmd/logger/target/http/http.go b/legacy/logger/target/http/http.go
similarity index 98%
rename from cmd/logger/target/http/http.go
rename to legacy/logger/target/http/http.go
index b777a01f8..cfb39a563 100644
--- a/cmd/logger/target/http/http.go
+++ b/legacy/logger/target/http/http.go
@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"strings"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // Target implements logger.Target and sends the json
diff --git a/cmd/logger/targets.go b/legacy/logger/targets.go
similarity index 100%
rename from cmd/logger/targets.go
rename to legacy/logger/targets.go
diff --git a/cmd/logger/utils.go b/legacy/logger/utils.go
similarity index 100%
rename from cmd/logger/utils.go
rename to legacy/logger/utils.go
diff --git a/cmd/main.go b/legacy/main.go
similarity index 99%
rename from cmd/main.go
rename to legacy/main.go
index 0661faaa9..cac76dadc 100644
--- a/cmd/main.go
+++ b/legacy/main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/merge-walk-pool.go b/legacy/merge-walk-pool.go
similarity index 99%
rename from cmd/merge-walk-pool.go
rename to legacy/merge-walk-pool.go
index 8f34afabd..a42b54e66 100644
--- a/cmd/merge-walk-pool.go
+++ b/legacy/merge-walk-pool.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"reflect"
diff --git a/cmd/merge-walk-pool_test.go b/legacy/merge-walk-pool_test.go
similarity index 99%
rename from cmd/merge-walk-pool_test.go
rename to legacy/merge-walk-pool_test.go
index ee127162c..207a08e5b 100644
--- a/cmd/merge-walk-pool_test.go
+++ b/legacy/merge-walk-pool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/metrics-router.go b/legacy/metrics-router.go
similarity index 99%
rename from cmd/metrics-router.go
rename to legacy/metrics-router.go
index 3e26fe7d7..8997c9da8 100644
--- a/cmd/metrics-router.go
+++ b/legacy/metrics-router.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/metrics.go b/legacy/metrics.go
similarity index 99%
rename from cmd/metrics.go
rename to legacy/metrics.go
index dd1ed16d6..c6c208062 100644
--- a/cmd/metrics.go
+++ b/legacy/metrics.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
@@ -22,8 +22,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
diff --git a/cmd/namespace-lock.go b/legacy/namespace-lock.go
similarity index 98%
rename from cmd/namespace-lock.go
rename to legacy/namespace-lock.go
index fd7547a79..a4d14ac9a 100644
--- a/cmd/namespace-lock.go
+++ b/legacy/namespace-lock.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/dsync"
 	"github.com/minio/minio/pkg/lsync"
 )
@@ -263,7 +263,7 @@ func getSource(n int) string {
 	if ok {
 		filename = pathutil.Base(filename)
 		funcName = strings.TrimPrefix(runtime.FuncForPC(pc).Name(),
-			"github.com/minio/minio/cmd.")
+			"github.com/minio/minio/legacy.")
 	} else {
 		filename = "<unknown>"
 		lineNum = 0
diff --git a/cmd/namespace-lock_test.go b/legacy/namespace-lock_test.go
similarity index 99%
rename from cmd/namespace-lock_test.go
rename to legacy/namespace-lock_test.go
index 692fe43c2..70e5c4145 100644
--- a/cmd/namespace-lock_test.go
+++ b/legacy/namespace-lock_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/naughty-disk_test.go b/legacy/naughty-disk_test.go
similarity index 99%
rename from cmd/naughty-disk_test.go
rename to legacy/naughty-disk_test.go
index 4ad887936..502ad6c62 100644
--- a/cmd/naughty-disk_test.go
+++ b/legacy/naughty-disk_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/net.go b/legacy/net.go
similarity index 99%
rename from cmd/net.go
rename to legacy/net.go
index 5bbc53578..ee84a5ff7 100644
--- a/cmd/net.go
+++ b/legacy/net.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
@@ -26,8 +26,8 @@ import (
 	"syscall"
 
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/net_test.go b/legacy/net_test.go
similarity index 99%
rename from cmd/net_test.go
rename to legacy/net_test.go
index 1b1903c8d..5ff2f83e7 100644
--- a/cmd/net_test.go
+++ b/legacy/net_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/notification.go b/legacy/notification.go
similarity index 99%
rename from cmd/notification.go
rename to legacy/notification.go
index 37fa8e323..c9d5d036b 100644
--- a/cmd/notification.go
+++ b/legacy/notification.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -30,8 +30,8 @@ import (
 
 	"github.com/klauspost/compress/zip"
 	"github.com/minio/minio-go/v6/pkg/set"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/obdinfo.go b/legacy/obdinfo.go
similarity index 99%
rename from cmd/obdinfo.go
rename to legacy/obdinfo.go
index 81d1a3d8c..672bfaeba 100644
--- a/cmd/obdinfo.go
+++ b/legacy/obdinfo.go
@@ -15,7 +15,7 @@
  *
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/obdinfo_other.go b/legacy/obdinfo_other.go
similarity index 99%
rename from cmd/obdinfo_other.go
rename to legacy/obdinfo_other.go
index edc9dc43c..af0463e50 100644
--- a/cmd/obdinfo_other.go
+++ b/legacy/obdinfo_other.go
@@ -17,7 +17,7 @@
  *
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/obdinfo_unix.go b/legacy/obdinfo_unix.go
similarity index 98%
rename from cmd/obdinfo_unix.go
rename to legacy/obdinfo_unix.go
index 02c82613c..09529f6da 100644
--- a/cmd/obdinfo_unix.go
+++ b/legacy/obdinfo_unix.go
@@ -17,7 +17,7 @@
  *
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/object-api-common.go b/legacy/object-api-common.go
similarity index 99%
rename from cmd/object-api-common.go
rename to legacy/object-api-common.go
index 6811d851d..da9e04095 100644
--- a/cmd/object-api-common.go
+++ b/legacy/object-api-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 const (
diff --git a/cmd/object-api-datatypes.go b/legacy/object-api-datatypes.go
similarity index 99%
rename from cmd/object-api-datatypes.go
rename to legacy/object-api-datatypes.go
index 926d306ae..ac6d36fa3 100644
--- a/cmd/object-api-datatypes.go
+++ b/legacy/object-api-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"
diff --git a/cmd/object-api-deleteobject_test.go b/legacy/object-api-deleteobject_test.go
similarity index 99%
rename from cmd/object-api-deleteobject_test.go
rename to legacy/object-api-deleteobject_test.go
index c3844fad8..e82b21e0e 100644
--- a/cmd/object-api-deleteobject_test.go
+++ b/legacy/object-api-deleteobject_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-errors.go b/legacy/object-api-errors.go
similarity index 99%
rename from cmd/object-api-errors.go
rename to legacy/object-api-errors.go
index fdc09c90b..336c201b2 100644
--- a/cmd/object-api-errors.go
+++ b/legacy/object-api-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/object-api-getobject_test.go b/legacy/object-api-getobject_test.go
similarity index 99%
rename from cmd/object-api-getobject_test.go
rename to legacy/object-api-getobject_test.go
index 3cded55fd..ea3ba310f 100644
--- a/cmd/object-api-getobject_test.go
+++ b/legacy/object-api-getobject_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-getobjectinfo_test.go b/legacy/object-api-getobjectinfo_test.go
similarity index 99%
rename from cmd/object-api-getobjectinfo_test.go
rename to legacy/object-api-getobjectinfo_test.go
index ba44d9d1f..cc6354fee 100644
--- a/cmd/object-api-getobjectinfo_test.go
+++ b/legacy/object-api-getobjectinfo_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-input-checks.go b/legacy/object-api-input-checks.go
similarity index 99%
rename from cmd/object-api-input-checks.go
rename to legacy/object-api-input-checks.go
index a66311834..194c0f3b9 100644
--- a/cmd/object-api-input-checks.go
+++ b/legacy/object-api-input-checks.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // Checks on GetObject arguments, bucket and object.
diff --git a/cmd/object-api-interface.go b/legacy/object-api-interface.go
similarity index 99%
rename from cmd/object-api-interface.go
rename to legacy/object-api-interface.go
index 2be7f223d..a9ef3fa77 100644
--- a/cmd/object-api-interface.go
+++ b/legacy/object-api-interface.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/object-api-listobjects_test.go b/legacy/object-api-listobjects_test.go
similarity index 99%
rename from cmd/object-api-listobjects_test.go
rename to legacy/object-api-listobjects_test.go
index a8f7c6372..104cffb8f 100644
--- a/cmd/object-api-listobjects_test.go
+++ b/legacy/object-api-listobjects_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-multipart_test.go b/legacy/object-api-multipart_test.go
similarity index 99%
rename from cmd/object-api-multipart_test.go
rename to legacy/object-api-multipart_test.go
index 351a5c944..40ad47f99 100644
--- a/cmd/object-api-multipart_test.go
+++ b/legacy/object-api-multipart_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-putobject_test.go b/legacy/object-api-putobject_test.go
similarity index 99%
rename from cmd/object-api-putobject_test.go
rename to legacy/object-api-putobject_test.go
index 9886d31f0..6d1989dbc 100644
--- a/cmd/object-api-putobject_test.go
+++ b/legacy/object-api-putobject_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/object-api-utils.go b/legacy/object-api-utils.go
similarity index 98%
rename from cmd/object-api-utils.go
rename to legacy/object-api-utils.go
index 4bec241e4..ca7defab4 100644
--- a/cmd/object-api-utils.go
+++ b/legacy/object-api-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -37,12 +37,12 @@ import (
 	"github.com/klauspost/compress/s2"
 	"github.com/klauspost/readahead"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/hash"
 	"github.com/minio/minio/pkg/ioutil"
 	"github.com/minio/minio/pkg/wildcard"
diff --git a/cmd/object-api-utils_test.go b/legacy/object-api-utils_test.go
similarity index 99%
rename from cmd/object-api-utils_test.go
rename to legacy/object-api-utils_test.go
index 9a98e4bfe..cbc118513 100644
--- a/cmd/object-api-utils_test.go
+++ b/legacy/object-api-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 	"testing"
 
 	"github.com/klauspost/compress/s2"
-	"github.com/minio/minio/cmd/config/compress"
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/config/compress"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // Tests validate bucket name.
diff --git a/cmd/object-handlers-common.go b/legacy/object-handlers-common.go
similarity index 99%
rename from cmd/object-handlers-common.go
rename to legacy/object-handlers-common.go
index 9d7ecb1b7..eb0c4db28 100644
--- a/cmd/object-handlers-common.go
+++ b/legacy/object-handlers-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,8 +23,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/handlers"
 )
diff --git a/cmd/object-handlers-common_test.go b/legacy/object-handlers-common_test.go
similarity index 98%
rename from cmd/object-handlers-common_test.go
rename to legacy/object-handlers-common_test.go
index ef725c673..e3db4d703 100644
--- a/cmd/object-handlers-common_test.go
+++ b/legacy/object-handlers-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/object-handlers.go b/legacy/object-handlers.go
similarity index 99%
rename from cmd/object-handlers.go
rename to legacy/object-handlers.go
index d8d7404e9..ea72c3568 100644
--- a/cmd/object-handlers.go
+++ b/legacy/object-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -35,11 +35,11 @@ import (
 	miniogo "github.com/minio/minio-go/v6"
 	"github.com/minio/minio-go/v6/pkg/encrypt"
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/config/storageclass"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/config/storageclass"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/event"
diff --git a/cmd/object-handlers_test.go b/legacy/object-handlers_test.go
similarity index 99%
rename from cmd/object-handlers_test.go
rename to legacy/object-handlers_test.go
index 592029553..4bc6d369b 100644
--- a/cmd/object-handlers_test.go
+++ b/legacy/object-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -37,8 +37,8 @@ import (
 	"testing"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/auth"
 	ioutilx "github.com/minio/minio/pkg/ioutil"
 )
diff --git a/cmd/object_api_suite_test.go b/legacy/object_api_suite_test.go
similarity index 99%
rename from cmd/object_api_suite_test.go
rename to legacy/object_api_suite_test.go
index cd8764397..73d9dadcf 100644
--- a/cmd/object_api_suite_test.go
+++ b/legacy/object_api_suite_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/os-dirent_fileino.go b/legacy/os-dirent_fileino.go
similarity index 98%
rename from cmd/os-dirent_fileino.go
rename to legacy/os-dirent_fileino.go
index 2a9104b4d..e96fc0b22 100644
--- a/cmd/os-dirent_fileino.go
+++ b/legacy/os-dirent_fileino.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/os-dirent_ino.go b/legacy/os-dirent_ino.go
similarity index 98%
rename from cmd/os-dirent_ino.go
rename to legacy/os-dirent_ino.go
index aa7ce457d..a0fd76638 100644
--- a/cmd/os-dirent_ino.go
+++ b/legacy/os-dirent_ino.go
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/os-dirent_namelen_bsd.go b/legacy/os-dirent_namelen_bsd.go
similarity index 98%
rename from cmd/os-dirent_namelen_bsd.go
rename to legacy/os-dirent_namelen_bsd.go
index 6286f2e8b..cd3c83265 100644
--- a/cmd/os-dirent_namelen_bsd.go
+++ b/legacy/os-dirent_namelen_bsd.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "syscall"
 
diff --git a/cmd/os-dirent_namelen_linux.go b/legacy/os-dirent_namelen_linux.go
similarity index 98%
rename from cmd/os-dirent_namelen_linux.go
rename to legacy/os-dirent_namelen_linux.go
index 00e56aac7..9b18c5542 100644
--- a/cmd/os-dirent_namelen_linux.go
+++ b/legacy/os-dirent_namelen_linux.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/os-readdir_other.go b/legacy/os-readdir_other.go
similarity index 99%
rename from cmd/os-readdir_other.go
rename to legacy/os-readdir_other.go
index febd16f48..de2180f9c 100644
--- a/cmd/os-readdir_other.go
+++ b/legacy/os-readdir_other.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io"
diff --git a/cmd/os-readdir_test.go b/legacy/os-readdir_test.go
similarity index 99%
rename from cmd/os-readdir_test.go
rename to legacy/os-readdir_test.go
index 2c6afb2b5..ba1939ee8 100644
--- a/cmd/os-readdir_test.go
+++ b/legacy/os-readdir_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/os-readdir_unix.go b/legacy/os-readdir_unix.go
similarity index 99%
rename from cmd/os-readdir_unix.go
rename to legacy/os-readdir_unix.go
index 09494f799..82fa823bd 100644
--- a/cmd/os-readdir_unix.go
+++ b/legacy/os-readdir_unix.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/os-readdir_windows.go b/legacy/os-readdir_windows.go
similarity index 99%
rename from cmd/os-readdir_windows.go
rename to legacy/os-readdir_windows.go
index 377bf38f6..ac9f34dfb 100644
--- a/cmd/os-readdir_windows.go
+++ b/legacy/os-readdir_windows.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/os-reliable.go b/legacy/os-reliable.go
similarity index 99%
rename from cmd/os-reliable.go
rename to legacy/os-reliable.go
index c76709d2e..e9d515e01 100644
--- a/cmd/os-reliable.go
+++ b/legacy/os-reliable.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/os-reliable_test.go b/legacy/os-reliable_test.go
similarity index 99%
rename from cmd/os-reliable_test.go
rename to legacy/os-reliable_test.go
index ba1b1a256..195ab016a 100644
--- a/cmd/os-reliable_test.go
+++ b/legacy/os-reliable_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/peer-rest-client.go b/legacy/peer-rest-client.go
similarity index 99%
rename from cmd/peer-rest-client.go
rename to legacy/peer-rest-client.go
index 3745a68b9..d91af292e 100644
--- a/cmd/peer-rest-client.go
+++ b/legacy/peer-rest-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -32,10 +32,10 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/http"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/http"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
 	xnet "github.com/minio/minio/pkg/net"
diff --git a/cmd/peer-rest-common.go b/legacy/peer-rest-common.go
similarity index 99%
rename from cmd/peer-rest-common.go
rename to legacy/peer-rest-common.go
index a26407342..04b37be53 100644
--- a/cmd/peer-rest-common.go
+++ b/legacy/peer-rest-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 const (
 	peerRESTVersion       = "v9"
diff --git a/cmd/peer-rest-server.go b/legacy/peer-rest-server.go
similarity index 99%
rename from cmd/peer-rest-server.go
rename to legacy/peer-rest-server.go
index da5b67c24..1c5e45c05 100644
--- a/cmd/peer-rest-server.go
+++ b/legacy/peer-rest-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/event"
 	"github.com/minio/minio/pkg/madmin"
 	trace "github.com/minio/minio/pkg/trace"
diff --git a/cmd/policy_test.go b/legacy/policy_test.go
similarity index 99%
rename from cmd/policy_test.go
rename to legacy/policy_test.go
index 785a61662..b1e1e4f86 100644
--- a/cmd/policy_test.go
+++ b/legacy/policy_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"reflect"
diff --git a/cmd/posix-diskid-check.go b/legacy/posix-diskid-check.go
similarity index 99%
rename from cmd/posix-diskid-check.go
rename to legacy/posix-diskid-check.go
index abe5bd5f1..b0b3d3e90 100644
--- a/cmd/posix-diskid-check.go
+++ b/legacy/posix-diskid-check.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/posix-errors.go b/legacy/posix-errors.go
similarity index 99%
rename from cmd/posix-errors.go
rename to legacy/posix-errors.go
index 652333260..036754b11 100644
--- a/cmd/posix-errors.go
+++ b/legacy/posix-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/posix-errors_test.go b/legacy/posix-errors_test.go
similarity index 99%
rename from cmd/posix-errors_test.go
rename to legacy/posix-errors_test.go
index da4624be3..8047ed785 100644
--- a/cmd/posix-errors_test.go
+++ b/legacy/posix-errors_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/posix.go b/legacy/posix.go
similarity index 99%
rename from cmd/posix.go
rename to legacy/posix.go
index 6d7dfae63..eebaed6fb 100644
--- a/cmd/posix.go
+++ b/legacy/posix.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -39,7 +39,7 @@ import (
 	humanize "github.com/dustin/go-humanize"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/klauspost/readahead"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/disk"
 	xioutil "github.com/minio/minio/pkg/ioutil"
 	"github.com/minio/minio/pkg/mountinfo"
diff --git a/cmd/posix_test.go b/legacy/posix_test.go
similarity index 99%
rename from cmd/posix_test.go
rename to legacy/posix_test.go
index 0c3cb23f4..0d268a6d7 100644
--- a/cmd/posix_test.go
+++ b/legacy/posix_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/posix_unix_test.go b/legacy/posix_unix_test.go
similarity index 99%
rename from cmd/posix_unix_test.go
rename to legacy/posix_unix_test.go
index a6dedd847..df334734c 100644
--- a/cmd/posix_unix_test.go
+++ b/legacy/posix_unix_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io/ioutil"
diff --git a/cmd/posix_windows_test.go b/legacy/posix_windows_test.go
similarity index 99%
rename from cmd/posix_windows_test.go
rename to legacy/posix_windows_test.go
index 2ae38d8c7..8c7af8317 100644
--- a/cmd/posix_windows_test.go
+++ b/legacy/posix_windows_test.go
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/post-policy_test.go b/legacy/post-policy_test.go
similarity index 99%
rename from cmd/post-policy_test.go
rename to legacy/post-policy_test.go
index 005b22a0a..0209f6888 100644
--- a/cmd/post-policy_test.go
+++ b/legacy/post-policy_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/postpolicyform.go b/legacy/postpolicyform.go
similarity index 99%
rename from cmd/postpolicyform.go
rename to legacy/postpolicyform.go
index 69889b4e1..2deb88f5d 100644
--- a/cmd/postpolicyform.go
+++ b/legacy/postpolicyform.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/json"
diff --git a/cmd/postpolicyform_test.go b/legacy/postpolicyform_test.go
similarity index 99%
rename from cmd/postpolicyform_test.go
rename to legacy/postpolicyform_test.go
index be39b6397..d3812226d 100644
--- a/cmd/postpolicyform_test.go
+++ b/legacy/postpolicyform_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/base64"
diff --git a/cmd/prepare-storage.go b/legacy/prepare-storage.go
similarity index 98%
rename from cmd/prepare-storage.go
rename to legacy/prepare-storage.go
index 9c813c96e..69214c68f 100644
--- a/cmd/prepare-storage.go
+++ b/legacy/prepare-storage.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/tls"
@@ -27,10 +27,10 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
 
diff --git a/cmd/rest/client.go b/legacy/rest/client.go
similarity index 99%
rename from cmd/rest/client.go
rename to legacy/rest/client.go
index f8a1d0b83..ce7b155fd 100644
--- a/cmd/rest/client.go
+++ b/legacy/rest/client.go
@@ -26,7 +26,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // DefaultRESTTimeout - default RPC timeout is one minute.
diff --git a/cmd/routers.go b/legacy/routers.go
similarity index 99%
rename from cmd/routers.go
rename to legacy/routers.go
index e78e72628..64b01e406 100644
--- a/cmd/routers.go
+++ b/legacy/routers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/server-main.go b/legacy/server-main.go
similarity index 99%
rename from cmd/server-main.go
rename to legacy/server-main.go
index b982f1bbd..8bfff83dd 100644
--- a/cmd/server-main.go
+++ b/legacy/server-main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -31,9 +31,9 @@ import (
 	"time"
 
 	"github.com/minio/cli"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/certs"
 	"github.com/minio/minio/pkg/color"
diff --git a/cmd/server-main_test.go b/legacy/server-main_test.go
similarity index 99%
rename from cmd/server-main_test.go
rename to legacy/server-main_test.go
index e05bbdcde..4495a9cb3 100644
--- a/cmd/server-main_test.go
+++ b/legacy/server-main_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/server-rlimit.go b/legacy/server-rlimit.go
similarity index 99%
rename from cmd/server-rlimit.go
rename to legacy/server-rlimit.go
index 7002d4001..38f06984a 100644
--- a/cmd/server-rlimit.go
+++ b/legacy/server-rlimit.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"runtime/debug"
diff --git a/cmd/server-startup-msg.go b/legacy/server-startup-msg.go
similarity index 99%
rename from cmd/server-startup-msg.go
rename to legacy/server-startup-msg.go
index d004dad45..52bd5985d 100644
--- a/cmd/server-startup-msg.go
+++ b/legacy/server-startup-msg.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/x509"
@@ -24,8 +24,8 @@ import (
 	"strings"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/logger"
 	color "github.com/minio/minio/pkg/color"
 	xnet "github.com/minio/minio/pkg/net"
 )
diff --git a/cmd/server-startup-msg_test.go b/legacy/server-startup-msg_test.go
similarity index 99%
rename from cmd/server-startup-msg_test.go
rename to legacy/server-startup-msg_test.go
index d0eb14f62..7c905568b 100644
--- a/cmd/server-startup-msg_test.go
+++ b/legacy/server-startup-msg_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
diff --git a/cmd/server_test.go b/legacy/server_test.go
similarity index 99%
rename from cmd/server_test.go
rename to legacy/server_test.go
index df59bf654..024e3326b 100644
--- a/cmd/server_test.go
+++ b/legacy/server_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/bucket/policy"
 )
 
diff --git a/cmd/service.go b/legacy/service.go
similarity index 99%
rename from cmd/service.go
rename to legacy/service.go
index 8f10eae16..9d00f9a29 100644
--- a/cmd/service.go
+++ b/legacy/service.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/setup-type.go b/legacy/setup-type.go
similarity index 98%
rename from cmd/setup-type.go
rename to legacy/setup-type.go
index 516e58213..d32d2a53a 100644
--- a/cmd/setup-type.go
+++ b/legacy/setup-type.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // SetupType - enum for setup type.
 type SetupType int
diff --git a/cmd/signals.go b/legacy/signals.go
similarity index 97%
rename from cmd/signals.go
rename to legacy/signals.go
index 965a85cc6..e3f45024c 100644
--- a/cmd/signals.go
+++ b/legacy/signals.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"os"
 	"strings"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 func handleSignals() {
diff --git a/cmd/signature-v2.go b/legacy/signature-v2.go
similarity index 99%
rename from cmd/signature-v2.go
rename to legacy/signature-v2.go
index 630c41514..87ef029ac 100644
--- a/cmd/signature-v2.go
+++ b/legacy/signature-v2.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"crypto/hmac"
@@ -28,7 +28,7 @@ import (
 	"strconv"
 	"strings"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 
 	"github.com/minio/minio/pkg/auth"
 )
diff --git a/cmd/signature-v2_test.go b/legacy/signature-v2_test.go
similarity index 99%
rename from cmd/signature-v2_test.go
rename to legacy/signature-v2_test.go
index 13930709a..9336356f8 100644
--- a/cmd/signature-v2_test.go
+++ b/legacy/signature-v2_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/signature-v4-parser.go b/legacy/signature-v4-parser.go
similarity index 99%
rename from cmd/signature-v4-parser.go
rename to legacy/signature-v4-parser.go
index 31006f118..7256b62e8 100644
--- a/cmd/signature-v4-parser.go
+++ b/legacy/signature-v4-parser.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
diff --git a/cmd/signature-v4-parser_test.go b/legacy/signature-v4-parser_test.go
similarity index 99%
rename from cmd/signature-v4-parser_test.go
rename to legacy/signature-v4-parser_test.go
index 13b1ee7f9..45c3bfeca 100644
--- a/cmd/signature-v4-parser_test.go
+++ b/legacy/signature-v4-parser_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/url"
diff --git a/cmd/signature-v4-utils.go b/legacy/signature-v4-utils.go
similarity index 98%
rename from cmd/signature-v4-utils.go
rename to legacy/signature-v4-utils.go
index 6f09d6881..d6a600132 100644
--- a/cmd/signature-v4-utils.go
+++ b/legacy/signature-v4-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,8 +26,8 @@ import (
 	"strconv"
 	"strings"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/sha256-simd"
 )
diff --git a/cmd/signature-v4-utils_test.go b/legacy/signature-v4-utils_test.go
similarity index 99%
rename from cmd/signature-v4-utils_test.go
rename to legacy/signature-v4-utils_test.go
index 399cf50c1..80bb0478d 100644
--- a/cmd/signature-v4-utils_test.go
+++ b/legacy/signature-v4-utils_test.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"net/http"
 	"testing"
 
-	"github.com/minio/minio/cmd/crypto"
+	"github.com/minio/minio/legacy/crypto"
 )
 
 // TestSkipContentSha256Cksum - Test validate the logic which decides whether
diff --git a/cmd/signature-v4.go b/legacy/signature-v4.go
similarity index 99%
rename from cmd/signature-v4.go
rename to legacy/signature-v4.go
index 9f1352861..6407c2cc4 100644
--- a/cmd/signature-v4.go
+++ b/legacy/signature-v4.go
@@ -22,7 +22,7 @@
 // - Based on Authorization header.
 // - Based on Query parameters.
 // - Based on Form POST policy.
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -36,7 +36,7 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	sha256 "github.com/minio/sha256-simd"
 )
 
diff --git a/cmd/signature-v4_test.go b/legacy/signature-v4_test.go
similarity index 99%
rename from cmd/signature-v4_test.go
rename to legacy/signature-v4_test.go
index f9fd3e133..004d2de06 100644
--- a/cmd/signature-v4_test.go
+++ b/legacy/signature-v4_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/storage-datatypes.go b/legacy/storage-datatypes.go
similarity index 97%
rename from cmd/storage-datatypes.go
rename to legacy/storage-datatypes.go
index 12f3ed194..24be38b4c 100644
--- a/cmd/storage-datatypes.go
+++ b/legacy/storage-datatypes.go
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"os"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 // VolInfo - represents volume stat information.
diff --git a/cmd/storage-errors.go b/legacy/storage-errors.go
similarity index 99%
rename from cmd/storage-errors.go
rename to legacy/storage-errors.go
index 6a674e1cc..f904a0c09 100644
--- a/cmd/storage-errors.go
+++ b/legacy/storage-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 // errUnexpected - unexpected error, requires manual intervention.
 var errUnexpected = StorageErr("Unexpected error, please report this issue at https://github.com/minio/minio/issues")
diff --git a/cmd/storage-interface.go b/legacy/storage-interface.go
similarity index 99%
rename from cmd/storage-interface.go
rename to legacy/storage-interface.go
index 7cfe37f8d..709626566 100644
--- a/cmd/storage-interface.go
+++ b/legacy/storage-interface.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/storage-rest-client.go b/legacy/storage-rest-client.go
similarity index 98%
rename from cmd/storage-rest-client.go
rename to legacy/storage-rest-client.go
index 38c3f0602..0e9fd7657 100644
--- a/cmd/storage-rest-client.go
+++ b/legacy/storage-rest-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -31,10 +31,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/minio/cmd/http"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/cmd/rest"
+	"github.com/minio/minio/legacy/http"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
+	"github.com/minio/minio/legacy/rest"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/storage-rest-common.go b/legacy/storage-rest-common.go
similarity index 99%
rename from cmd/storage-rest-common.go
rename to legacy/storage-rest-common.go
index a52c63ec3..dbf6fd474 100644
--- a/cmd/storage-rest-common.go
+++ b/legacy/storage-rest-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 const (
 	storageRESTVersion       = "v17" // RemoveBucket API change
diff --git a/cmd/storage-rest-server.go b/legacy/storage-rest-server.go
similarity index 99%
rename from cmd/storage-rest-server.go
rename to legacy/storage-rest-server.go
index d105e3170..5ebeecbbb 100644
--- a/cmd/storage-rest-server.go
+++ b/legacy/storage-rest-server.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -33,10 +33,10 @@ import (
 
 	jwtreq "github.com/dgrijalva/jwt-go/request"
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
-	xhttp "github.com/minio/minio/cmd/http"
-	xjwt "github.com/minio/minio/cmd/jwt"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	xhttp "github.com/minio/minio/legacy/http"
+	xjwt "github.com/minio/minio/legacy/jwt"
+	"github.com/minio/minio/legacy/logger"
 )
 
 var errDiskStale = errors.New("disk stale")
diff --git a/cmd/storage-rest_test.go b/legacy/storage-rest_test.go
similarity index 99%
rename from cmd/storage-rest_test.go
rename to legacy/storage-rest_test.go
index 525e50a5c..995f6f5e0 100644
--- a/cmd/storage-rest_test.go
+++ b/legacy/storage-rest_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"io/ioutil"
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config"
+	"github.com/minio/minio/legacy/config"
 	xnet "github.com/minio/minio/pkg/net"
 )
 
diff --git a/cmd/streaming-signature-v4.go b/legacy/streaming-signature-v4.go
similarity index 99%
rename from cmd/streaming-signature-v4.go
rename to legacy/streaming-signature-v4.go
index 0de211593..f2749c09b 100644
--- a/cmd/streaming-signature-v4.go
+++ b/legacy/streaming-signature-v4.go
@@ -16,7 +16,7 @@
 
 // Package cmd This file implements helper functions to validate Streaming AWS
 // Signature Version '4' authorization header.
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -29,7 +29,7 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 	"github.com/minio/minio/pkg/auth"
 	sha256 "github.com/minio/sha256-simd"
 )
diff --git a/cmd/streaming-signature-v4_test.go b/legacy/streaming-signature-v4_test.go
similarity index 99%
rename from cmd/streaming-signature-v4_test.go
rename to legacy/streaming-signature-v4_test.go
index e3474b2e0..ae37f4062 100644
--- a/cmd/streaming-signature-v4_test.go
+++ b/legacy/streaming-signature-v4_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
diff --git a/cmd/sts-datatypes.go b/legacy/sts-datatypes.go
similarity index 99%
rename from cmd/sts-datatypes.go
rename to legacy/sts-datatypes.go
index 18f440d82..53d73b11f 100644
--- a/cmd/sts-datatypes.go
+++ b/legacy/sts-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"encoding/xml"
diff --git a/cmd/sts-errors.go b/legacy/sts-errors.go
similarity index 98%
rename from cmd/sts-errors.go
rename to legacy/sts-errors.go
index 7f10af191..38dd46a29 100644
--- a/cmd/sts-errors.go
+++ b/legacy/sts-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"net/http"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 )
 
 // writeSTSErrorRespone writes error headers
diff --git a/cmd/sts-handlers.go b/legacy/sts-handlers.go
similarity index 99%
rename from cmd/sts-handlers.go
rename to legacy/sts-handlers.go
index fdc3806b3..628fbf36b 100644
--- a/cmd/sts-handlers.go
+++ b/legacy/sts-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -25,9 +25,9 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	iampolicy "github.com/minio/minio/pkg/iam/policy"
 	"github.com/minio/minio/pkg/wildcard"
diff --git a/cmd/test-utils_test.go b/legacy/test-utils_test.go
similarity index 99%
rename from cmd/test-utils_test.go
rename to legacy/test-utils_test.go
index 348ad3ef8..29c51f497 100644
--- a/cmd/test-utils_test.go
+++ b/legacy/test-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -56,9 +56,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
 	"github.com/minio/minio-go/v6/pkg/signer"
-	"github.com/minio/minio/cmd/config"
-	"github.com/minio/minio/cmd/crypto"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config"
+	"github.com/minio/minio/legacy/crypto"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	"github.com/minio/minio/pkg/bucket/policy"
 	"github.com/minio/minio/pkg/hash"
diff --git a/cmd/tree-walk-pool.go b/legacy/tree-walk-pool.go
similarity index 99%
rename from cmd/tree-walk-pool.go
rename to legacy/tree-walk-pool.go
index 54e568304..2310471b5 100644
--- a/cmd/tree-walk-pool.go
+++ b/legacy/tree-walk-pool.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/tree-walk-pool_test.go b/legacy/tree-walk-pool_test.go
similarity index 99%
rename from cmd/tree-walk-pool_test.go
rename to legacy/tree-walk-pool_test.go
index 313383d1a..22d5535d0 100644
--- a/cmd/tree-walk-pool_test.go
+++ b/legacy/tree-walk-pool_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/tree-walk.go b/legacy/tree-walk.go
similarity index 99%
rename from cmd/tree-walk.go
rename to legacy/tree-walk.go
index ff76a3872..71a76f46c 100644
--- a/cmd/tree-walk.go
+++ b/legacy/tree-walk.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/tree-walk_test.go b/legacy/tree-walk_test.go
similarity index 99%
rename from cmd/tree-walk_test.go
rename to legacy/tree-walk_test.go
index 0ea5e02d1..68a15843b 100644
--- a/cmd/tree-walk_test.go
+++ b/legacy/tree-walk_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/typed-errors.go b/legacy/typed-errors.go
similarity index 99%
rename from cmd/typed-errors.go
rename to legacy/typed-errors.go
index 273154725..a54ed9ef7 100644
--- a/cmd/typed-errors.go
+++ b/legacy/typed-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/update-notifier.go b/legacy/update-notifier.go
similarity index 99%
rename from cmd/update-notifier.go
rename to legacy/update-notifier.go
index f80c7d532..614db517c 100644
--- a/cmd/update-notifier.go
+++ b/legacy/update-notifier.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/update-notifier_test.go b/legacy/update-notifier_test.go
similarity index 99%
rename from cmd/update-notifier_test.go
rename to legacy/update-notifier_test.go
index b175ede39..5dd57107d 100644
--- a/cmd/update-notifier_test.go
+++ b/legacy/update-notifier_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/update.go b/legacy/update.go
similarity index 99%
rename from cmd/update.go
rename to legacy/update.go
index dcf20c148..a04037aa2 100644
--- a/cmd/update.go
+++ b/legacy/update.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bufio"
@@ -32,8 +32,8 @@ import (
 	"time"
 
 	"github.com/inconshreveable/go-update"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 	xnet "github.com/minio/minio/pkg/net"
 	_ "github.com/minio/sha256-simd" // Needed for sha256 hash verifier.
diff --git a/cmd/update_test.go b/legacy/update_test.go
similarity index 99%
rename from cmd/update_test.go
rename to legacy/update_test.go
index 5a4b73afd..5bf0d4659 100644
--- a/cmd/update_test.go
+++ b/legacy/update_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"fmt"
diff --git a/cmd/utils.go b/legacy/utils.go
similarity index 99%
rename from cmd/utils.go
rename to legacy/utils.go
index 1b28ba915..20d4078a3 100644
--- a/cmd/utils.go
+++ b/legacy/utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -39,8 +39,8 @@ import (
 	"sync"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 	"github.com/minio/minio/pkg/madmin"
 
diff --git a/cmd/utils_test.go b/legacy/utils_test.go
similarity index 99%
rename from cmd/utils_test.go
rename to legacy/utils_test.go
index 39ed623d7..bebbd9062 100644
--- a/cmd/utils_test.go
+++ b/legacy/utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/version_test.go b/legacy/version_test.go
similarity index 98%
rename from cmd/version_test.go
rename to legacy/version_test.go
index d76977cd5..f6baa2588 100644
--- a/cmd/version_test.go
+++ b/legacy/version_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/web-handler-context.go b/legacy/web-handler-context.go
similarity index 99%
rename from cmd/web-handler-context.go
rename to legacy/web-handler-context.go
index be18b241c..46a4aff4c 100644
--- a/cmd/web-handler-context.go
+++ b/legacy/web-handler-context.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/handlers"
 )
 
diff --git a/cmd/web-handler-context_test.go b/legacy/web-handler-context_test.go
similarity index 97%
rename from cmd/web-handler-context_test.go
rename to legacy/web-handler-context_test.go
index 807f96d04..4ddcd00d7 100644
--- a/cmd/web-handler-context_test.go
+++ b/legacy/web-handler-context_test.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
 	"net/http"
 	"testing"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 )
 
 func TestKeyValueMap(t *testing.T) {
diff --git a/cmd/web-handlers.go b/legacy/web-handlers.go
similarity index 99%
rename from cmd/web-handlers.go
rename to legacy/web-handlers.go
index ab768ee6d..0cb9d2616 100644
--- a/cmd/web-handlers.go
+++ b/legacy/web-handlers.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -37,11 +37,11 @@ import (
 	"github.com/klauspost/compress/zip"
 	miniogopolicy "github.com/minio/minio-go/v6/pkg/policy"
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/config/etcd/dns"
-	"github.com/minio/minio/cmd/config/identity/openid"
-	"github.com/minio/minio/cmd/crypto"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/etcd/dns"
+	"github.com/minio/minio/legacy/config/identity/openid"
+	"github.com/minio/minio/legacy/crypto"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/auth"
 	objectlock "github.com/minio/minio/pkg/bucket/object/lock"
 	"github.com/minio/minio/pkg/bucket/policy"
diff --git a/cmd/web-handlers_test.go b/legacy/web-handlers_test.go
similarity index 99%
rename from cmd/web-handlers_test.go
rename to legacy/web-handlers_test.go
index 676410195..f3be88396 100644
--- a/cmd/web-handlers_test.go
+++ b/legacy/web-handlers_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"archive/zip"
@@ -35,7 +35,7 @@ import (
 
 	jwtgo "github.com/dgrijalva/jwt-go"
 	humanize "github.com/dustin/go-humanize"
-	xjwt "github.com/minio/minio/cmd/jwt"
+	xjwt "github.com/minio/minio/legacy/jwt"
 	"github.com/minio/minio/pkg/hash"
 )
 
diff --git a/cmd/web-router.go b/legacy/web-router.go
similarity index 99%
rename from cmd/web-router.go
rename to legacy/web-router.go
index 02bd8221a..cdf86c2a7 100644
--- a/cmd/web-router.go
+++ b/legacy/web-router.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"errors"
diff --git a/cmd/xl-sets.go b/legacy/xl-sets.go
similarity index 99%
rename from cmd/xl-sets.go
rename to legacy/xl-sets.go
index 0bef6fb84..47d10b08c 100644
--- a/cmd/xl-sets.go
+++ b/legacy/xl-sets.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -28,9 +28,9 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/storageclass"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/storageclass"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bpool"
 	"github.com/minio/minio/pkg/dsync"
 	"github.com/minio/minio/pkg/madmin"
diff --git a/cmd/xl-sets_test.go b/legacy/xl-sets_test.go
similarity index 99%
rename from cmd/xl-sets_test.go
rename to legacy/xl-sets_test.go
index 91d2f9522..c708f6e90 100644
--- a/cmd/xl-sets_test.go
+++ b/legacy/xl-sets_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-bucket.go b/legacy/xl-v1-bucket.go
similarity index 99%
rename from cmd/xl-v1-bucket.go
rename to legacy/xl-v1-bucket.go
index 5c1cf6a38..193764b78 100644
--- a/cmd/xl-v1-bucket.go
+++ b/legacy/xl-v1-bucket.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"sort"
 
 	"github.com/minio/minio-go/v6/pkg/s3utils"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-common.go b/legacy/xl-v1-common.go
similarity index 99%
rename from cmd/xl-v1-common.go
rename to legacy/xl-v1-common.go
index be826dee0..39ef69324 100644
--- a/cmd/xl-v1-common.go
+++ b/legacy/xl-v1-common.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-common_test.go b/legacy/xl-v1-common_test.go
similarity index 99%
rename from cmd/xl-v1-common_test.go
rename to legacy/xl-v1-common_test.go
index 876ecb72e..9af8b12f7 100644
--- a/cmd/xl-v1-common_test.go
+++ b/legacy/xl-v1-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1-errors.go b/legacy/xl-v1-errors.go
similarity index 98%
rename from cmd/xl-v1-errors.go
rename to legacy/xl-v1-errors.go
index 3dc0260b7..5b3768f99 100644
--- a/cmd/xl-v1-errors.go
+++ b/legacy/xl-v1-errors.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import "errors"
 
diff --git a/cmd/xl-v1-healing-common.go b/legacy/xl-v1-healing-common.go
similarity index 99%
rename from cmd/xl-v1-healing-common.go
rename to legacy/xl-v1-healing-common.go
index f7daef0bd..90310fbf0 100644
--- a/cmd/xl-v1-healing-common.go
+++ b/legacy/xl-v1-healing-common.go
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 	"fmt"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/xl-v1-healing-common_test.go b/legacy/xl-v1-healing-common_test.go
similarity index 99%
rename from cmd/xl-v1-healing-common_test.go
rename to legacy/xl-v1-healing-common_test.go
index 7d2df85e1..95f85b84e 100644
--- a/cmd/xl-v1-healing-common_test.go
+++ b/legacy/xl-v1-healing-common_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1-healing.go b/legacy/xl-v1-healing.go
similarity index 99%
rename from cmd/xl-v1-healing.go
rename to legacy/xl-v1-healing.go
index 20d9c57a3..811701ca3 100644
--- a/cmd/xl-v1-healing.go
+++ b/legacy/xl-v1-healing.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-healing_test.go b/legacy/xl-v1-healing_test.go
similarity index 99%
rename from cmd/xl-v1-healing_test.go
rename to legacy/xl-v1-healing_test.go
index 3afd9ed71..9cb12dc0d 100644
--- a/cmd/xl-v1-healing_test.go
+++ b/legacy/xl-v1-healing_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1-list-objects-heal.go b/legacy/xl-v1-list-objects-heal.go
similarity index 96%
rename from cmd/xl-v1-list-objects-heal.go
rename to legacy/xl-v1-list-objects-heal.go
index 4974b7721..3d0d735c8 100644
--- a/cmd/xl-v1-list-objects-heal.go
+++ b/legacy/xl-v1-list-objects-heal.go
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/xl-v1-list-objects.go b/legacy/xl-v1-list-objects.go
similarity index 98%
rename from cmd/xl-v1-list-objects.go
rename to legacy/xl-v1-list-objects.go
index 16e267293..331589356 100644
--- a/cmd/xl-v1-list-objects.go
+++ b/legacy/xl-v1-list-objects.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-metadata.go b/legacy/xl-v1-metadata.go
similarity index 99%
rename from cmd/xl-v1-metadata.go
rename to legacy/xl-v1-metadata.go
index 4941d2685..6b38230f1 100644
--- a/cmd/xl-v1-metadata.go
+++ b/legacy/xl-v1-metadata.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/sync/errgroup"
 	"github.com/minio/sha256-simd"
 )
diff --git a/cmd/xl-v1-metadata_test.go b/legacy/xl-v1-metadata_test.go
similarity index 99%
rename from cmd/xl-v1-metadata_test.go
rename to legacy/xl-v1-metadata_test.go
index fad2cd3cb..a11781ff0 100644
--- a/cmd/xl-v1-metadata_test.go
+++ b/legacy/xl-v1-metadata_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"testing"
diff --git a/cmd/xl-v1-multipart.go b/legacy/xl-v1-multipart.go
similarity index 99%
rename from cmd/xl-v1-multipart.go
rename to legacy/xl-v1-multipart.go
index 821220be2..b555931ab 100644
--- a/cmd/xl-v1-multipart.go
+++ b/legacy/xl-v1-multipart.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/mimedb"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-multipart_test.go b/legacy/xl-v1-multipart_test.go
similarity index 99%
rename from cmd/xl-v1-multipart_test.go
rename to legacy/xl-v1-multipart_test.go
index f2f14ed96..b0a368b45 100644
--- a/cmd/xl-v1-multipart_test.go
+++ b/legacy/xl-v1-multipart_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
diff --git a/cmd/xl-v1-object.go b/legacy/xl-v1-object.go
similarity index 99%
rename from cmd/xl-v1-object.go
rename to legacy/xl-v1-object.go
index 6cc0b7101..2b5e490c7 100644
--- a/cmd/xl-v1-object.go
+++ b/legacy/xl-v1-object.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -26,8 +26,8 @@ import (
 	"sync"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/mimedb"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/cmd/xl-v1-object_test.go b/legacy/xl-v1-object_test.go
similarity index 99%
rename from cmd/xl-v1-object_test.go
rename to legacy/xl-v1-object_test.go
index 1e7dfac3d..626259f87 100644
--- a/cmd/xl-v1-object_test.go
+++ b/legacy/xl-v1-object_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	humanize "github.com/dustin/go-humanize"
-	"github.com/minio/minio/cmd/config/storageclass"
+	"github.com/minio/minio/legacy/config/storageclass"
 	"github.com/minio/minio/pkg/madmin"
 )
 
diff --git a/cmd/xl-v1-utils.go b/legacy/xl-v1-utils.go
similarity index 99%
rename from cmd/xl-v1-utils.go
rename to legacy/xl-v1-utils.go
index c77b2ed4e..1fffb8171 100644
--- a/cmd/xl-v1-utils.go
+++ b/legacy/xl-v1-utils.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -23,7 +23,7 @@ import (
 	"path"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
 
diff --git a/cmd/xl-v1-utils_test.go b/legacy/xl-v1-utils_test.go
similarity index 99%
rename from cmd/xl-v1-utils_test.go
rename to legacy/xl-v1-utils_test.go
index 7ab5e0cd1..8197d2b67 100644
--- a/cmd/xl-v1-utils_test.go
+++ b/legacy/xl-v1-utils_test.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"bytes"
diff --git a/cmd/xl-v1.go b/legacy/xl-v1.go
similarity index 99%
rename from cmd/xl-v1.go
rename to legacy/xl-v1.go
index 29c70088f..7bbdbb2a9 100644
--- a/cmd/xl-v1.go
+++ b/legacy/xl-v1.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/bpool"
 	"github.com/minio/minio/pkg/color"
 	"github.com/minio/minio/pkg/dsync"
diff --git a/cmd/xl-zones.go b/legacy/xl-zones.go
similarity index 99%
rename from cmd/xl-zones.go
rename to legacy/xl-zones.go
index 4c45d46ab..8f955658d 100644
--- a/cmd/xl-zones.go
+++ b/legacy/xl-zones.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package legacy
 
 import (
 	"context"
@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"github.com/minio/minio-go/v6/pkg/tags"
-	"github.com/minio/minio/cmd/config/storageclass"
-	xhttp "github.com/minio/minio/cmd/http"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/config/storageclass"
+	xhttp "github.com/minio/minio/legacy/http"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/madmin"
 	"github.com/minio/minio/pkg/sync/errgroup"
 )
diff --git a/pkg/bucket/object/lock/lock.go b/pkg/bucket/object/lock/lock.go
index 3acc85a80..df8cbca8c 100644
--- a/pkg/bucket/object/lock/lock.go
+++ b/pkg/bucket/object/lock/lock.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/beevik/ntp"
-	"github.com/minio/minio/cmd/logger"
+	"github.com/minio/minio/legacy/logger"
 	"github.com/minio/minio/pkg/env"
 )
 
diff --git a/pkg/bucket/object/lock/lock_test.go b/pkg/bucket/object/lock/lock_test.go
index 6e50364e8..9edd7f63e 100644
--- a/pkg/bucket/object/lock/lock_test.go
+++ b/pkg/bucket/object/lock/lock_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	xhttp "github.com/minio/minio/cmd/http"
+	xhttp "github.com/minio/minio/legacy/http"
 )
 
 func TestParseMode(t *testing.T) {