diff --git a/perl-xCAT-2.0/LICENSE.html b/perl-xCAT/LICENSE.html
similarity index 100%
rename from perl-xCAT-2.0/LICENSE.html
rename to perl-xCAT/LICENSE.html
diff --git a/perl-xCAT-2.0/Makefile.PL b/perl-xCAT/Makefile.PL
similarity index 100%
rename from perl-xCAT-2.0/Makefile.PL
rename to perl-xCAT/Makefile.PL
diff --git a/perl-xCAT-2.0/README b/perl-xCAT/README
similarity index 100%
rename from perl-xCAT-2.0/README
rename to perl-xCAT/README
diff --git a/perl-xCAT-2.0/db2man b/perl-xCAT/db2man
similarity index 100%
rename from perl-xCAT-2.0/db2man
rename to perl-xCAT/db2man
diff --git a/perl-xCAT-2.0/debian/changelog b/perl-xCAT/debian/changelog
similarity index 100%
rename from perl-xCAT-2.0/debian/changelog
rename to perl-xCAT/debian/changelog
diff --git a/perl-xCAT-2.0/debian/compat b/perl-xCAT/debian/compat
similarity index 100%
rename from perl-xCAT-2.0/debian/compat
rename to perl-xCAT/debian/compat
diff --git a/perl-xCAT-2.0/debian/control b/perl-xCAT/debian/control
similarity index 100%
rename from perl-xCAT-2.0/debian/control
rename to perl-xCAT/debian/control
diff --git a/perl-xCAT-2.0/debian/control.template b/perl-xCAT/debian/control.template
similarity index 100%
rename from perl-xCAT-2.0/debian/control.template
rename to perl-xCAT/debian/control.template
diff --git a/perl-xCAT-2.0/debian/copyright b/perl-xCAT/debian/copyright
similarity index 100%
rename from perl-xCAT-2.0/debian/copyright
rename to perl-xCAT/debian/copyright
diff --git a/perl-xCAT-2.0/debian/dirs b/perl-xCAT/debian/dirs
similarity index 100%
rename from perl-xCAT-2.0/debian/dirs
rename to perl-xCAT/debian/dirs
diff --git a/perl-xCAT-2.0/debian/docs b/perl-xCAT/debian/docs
similarity index 100%
rename from perl-xCAT-2.0/debian/docs
rename to perl-xCAT/debian/docs
diff --git a/perl-xCAT-2.0/debian/files b/perl-xCAT/debian/files
similarity index 100%
rename from perl-xCAT-2.0/debian/files
rename to perl-xCAT/debian/files
diff --git a/perl-xCAT-2.0/debian/perl-xcat.install b/perl-xCAT/debian/perl-xcat.install
similarity index 100%
rename from perl-xCAT-2.0/debian/perl-xcat.install
rename to perl-xCAT/debian/perl-xcat.install
diff --git a/perl-xCAT-2.0/debian/perl-xcat.substvars b/perl-xCAT/debian/perl-xcat.substvars
similarity index 100%
rename from perl-xCAT-2.0/debian/perl-xcat.substvars
rename to perl-xCAT/debian/perl-xcat.substvars
diff --git a/perl-xCAT-2.0/debian/postinst b/perl-xCAT/debian/postinst
similarity index 100%
rename from perl-xCAT-2.0/debian/postinst
rename to perl-xCAT/debian/postinst
diff --git a/perl-xCAT-2.0/debian/rules b/perl-xCAT/debian/rules
similarity index 100%
rename from perl-xCAT-2.0/debian/rules
rename to perl-xCAT/debian/rules
diff --git a/perl-xCAT-2.0/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec
similarity index 100%
rename from perl-xCAT-2.0/perl-xCAT.spec
rename to perl-xCAT/perl-xCAT.spec
diff --git a/perl-xCAT-2.0/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Client.pm
rename to perl-xCAT/xCAT/Client.pm
diff --git a/perl-xCAT-2.0/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/DBobjUtils.pm
rename to perl-xCAT/xCAT/DBobjUtils.pm
diff --git a/perl-xCAT-2.0/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/DSHCLI.pm
rename to perl-xCAT/xCAT/DSHCLI.pm
diff --git a/perl-xCAT-2.0/xCAT/DSHContext.pm b/perl-xCAT/xCAT/DSHContext.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/DSHContext.pm
rename to perl-xCAT/xCAT/DSHContext.pm
diff --git a/perl-xCAT-2.0/xCAT/DSHCore.pm b/perl-xCAT/xCAT/DSHCore.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/DSHCore.pm
rename to perl-xCAT/xCAT/DSHCore.pm
diff --git a/perl-xCAT-2.0/xCAT/DSHRemoteShell.pm b/perl-xCAT/xCAT/DSHRemoteShell.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/DSHRemoteShell.pm
rename to perl-xCAT/xCAT/DSHRemoteShell.pm
diff --git a/perl-xCAT-2.0/xCAT/GlobalDef.pm b/perl-xCAT/xCAT/GlobalDef.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/GlobalDef.pm
rename to perl-xCAT/xCAT/GlobalDef.pm
diff --git a/perl-xCAT-2.0/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/MacMap.pm
rename to perl-xCAT/xCAT/MacMap.pm
diff --git a/perl-xCAT-2.0/xCAT/MsgUtils.pm b/perl-xCAT/xCAT/MsgUtils.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/MsgUtils.pm
rename to perl-xCAT/xCAT/MsgUtils.pm
diff --git a/perl-xCAT-2.0/xCAT/NodeRange.pm b/perl-xCAT/xCAT/NodeRange.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/NodeRange.pm
rename to perl-xCAT/xCAT/NodeRange.pm
diff --git a/perl-xCAT-2.0/xCAT/NotifHandler.pm b/perl-xCAT/xCAT/NotifHandler.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/NotifHandler.pm
rename to perl-xCAT/xCAT/NotifHandler.pm
diff --git a/perl-xCAT-2.0/xCAT/PPC.pm b/perl-xCAT/xCAT/PPC.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPC.pm
rename to perl-xCAT/xCAT/PPC.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCboot.pm b/perl-xCAT/xCAT/PPCboot.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCboot.pm
rename to perl-xCAT/xCAT/PPCboot.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCcfg.pm b/perl-xCAT/xCAT/PPCcfg.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCcfg.pm
rename to perl-xCAT/xCAT/PPCcfg.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCcli.pm b/perl-xCAT/xCAT/PPCcli.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCcli.pm
rename to perl-xCAT/xCAT/PPCcli.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCdb.pm b/perl-xCAT/xCAT/PPCdb.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCdb.pm
rename to perl-xCAT/xCAT/PPCdb.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCfsp.pm b/perl-xCAT/xCAT/PPCfsp.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCfsp.pm
rename to perl-xCAT/xCAT/PPCfsp.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCinv.pm b/perl-xCAT/xCAT/PPCinv.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCinv.pm
rename to perl-xCAT/xCAT/PPCinv.pm
diff --git a/perl-xCAT-2.0/xCAT/PPClog.pm b/perl-xCAT/xCAT/PPClog.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPClog.pm
rename to perl-xCAT/xCAT/PPClog.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCmac.pm b/perl-xCAT/xCAT/PPCmac.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCmac.pm
rename to perl-xCAT/xCAT/PPCmac.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCpower.pm b/perl-xCAT/xCAT/PPCpower.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCpower.pm
rename to perl-xCAT/xCAT/PPCpower.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCscan.pm b/perl-xCAT/xCAT/PPCscan.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCscan.pm
rename to perl-xCAT/xCAT/PPCscan.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCvitals.pm b/perl-xCAT/xCAT/PPCvitals.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCvitals.pm
rename to perl-xCAT/xCAT/PPCvitals.pm
diff --git a/perl-xCAT-2.0/xCAT/PPCvm.pm b/perl-xCAT/xCAT/PPCvm.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/PPCvm.pm
rename to perl-xCAT/xCAT/PPCvm.pm
diff --git a/perl-xCAT-2.0/xCAT/Postage.pm b/perl-xCAT/xCAT/Postage.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Postage.pm
rename to perl-xCAT/xCAT/Postage.pm
diff --git a/perl-xCAT-2.0/xCAT/RSH.pm b/perl-xCAT/xCAT/RSH.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/RSH.pm
rename to perl-xCAT/xCAT/RSH.pm
diff --git a/perl-xCAT-2.0/xCAT/RSYNC.pm b/perl-xCAT/xCAT/RSYNC.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/RSYNC.pm
rename to perl-xCAT/xCAT/RSYNC.pm
diff --git a/perl-xCAT-2.0/xCAT/SSH.pm b/perl-xCAT/xCAT/SSH.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/SSH.pm
rename to perl-xCAT/xCAT/SSH.pm
diff --git a/perl-xCAT-2.0/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Schema.pm
rename to perl-xCAT/xCAT/Schema.pm
diff --git a/perl-xCAT-2.0/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Scope.pm
rename to perl-xCAT/xCAT/Scope.pm
diff --git a/perl-xCAT-2.0/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Table.pm
rename to perl-xCAT/xCAT/Table.pm
diff --git a/perl-xCAT-2.0/xCAT/Template.pm b/perl-xCAT/xCAT/Template.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Template.pm
rename to perl-xCAT/xCAT/Template.pm
diff --git a/perl-xCAT-2.0/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Usage.pm
rename to perl-xCAT/xCAT/Usage.pm
diff --git a/perl-xCAT-2.0/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Utils.pm
rename to perl-xCAT/xCAT/Utils.pm
diff --git a/perl-xCAT-2.0/xCAT/Yum.pm b/perl-xCAT/xCAT/Yum.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/Yum.pm
rename to perl-xCAT/xCAT/Yum.pm
diff --git a/perl-xCAT-2.0/xCAT/data/ibmleds.pm b/perl-xCAT/xCAT/data/ibmleds.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/data/ibmleds.pm
rename to perl-xCAT/xCAT/data/ibmleds.pm
diff --git a/perl-xCAT-2.0/xCAT/data/ipmigenericevents.pm b/perl-xCAT/xCAT/data/ipmigenericevents.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/data/ipmigenericevents.pm
rename to perl-xCAT/xCAT/data/ipmigenericevents.pm
diff --git a/perl-xCAT-2.0/xCAT/data/ipmisensorevents.pm b/perl-xCAT/xCAT/data/ipmisensorevents.pm
similarity index 100%
rename from perl-xCAT-2.0/xCAT/data/ipmisensorevents.pm
rename to perl-xCAT/xCAT/data/ipmisensorevents.pm
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index 62bb01cea..c52ef4d78 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -4,7 +4,7 @@ Version: 2.1
 Release: snap%(date +"%Y%m%d%H%M")
 License: EPL
 Group: Applications/System
-Source: xCAT-client-2.0.tar.gz
+Source: xCAT-client-2.1.tar.gz
 Packager: IBM Corp.
 Vendor: IBM Corp.
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index a945c780c..9bc5e848c 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -4,7 +4,7 @@ Version: 2.1
 Release: snap%(date +"%Y%m%d%H%M")
 License: EPL
 Group: Applications/System
-Source: xCAT-server-2.0.tar.gz
+Source: xCAT-server-2.1.tar.gz
 Packager: IBM Corp.
 Vendor: IBM Corp.
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}