diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java b/network/common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java
similarity index 100%
rename from network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java
rename to network/common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java b/network/common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java
similarity index 100%
rename from network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java
rename to network/common/src/main/java/org/apache/spark/network/sasl/SaslMessage.java
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java b/network/common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java
similarity index 100%
rename from network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java
rename to network/common/src/main/java/org/apache/spark/network/sasl/SaslRpcHandler.java
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java b/network/common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java
similarity index 100%
rename from network/shuffle/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java
rename to network/common/src/main/java/org/apache/spark/network/sasl/SecretKeyHolder.java
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java b/network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java
similarity index 100%
rename from network/shuffle/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java
rename to network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java b/network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java
similarity index 100%
rename from network/shuffle/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java
rename to network/common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java
diff --git a/network/shuffle/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java b/network/common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java
similarity index 100%
rename from network/shuffle/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java
rename to network/common/src/test/java/org/apache/spark/network/sasl/SparkSaslSuite.java