From e68fe9d2db84da53b51d85039e35d1ac0d03b12a Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 3 Jun 2008 14:56:33 +0000 Subject: [PATCH] -Move xCAT-server and client to not have 2.0 in name for trunk git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1561 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- {xCAT-client-2.0 => xCAT-client}/LICENSE.html | 0 {xCAT-client-2.0 => xCAT-client}/bin/pping | 0 {xCAT-client-2.0 => xCAT-client}/bin/prsync | 0 {xCAT-client-2.0 => xCAT-client}/bin/pscp | 0 {xCAT-client-2.0 => xCAT-client}/bin/psh | 0 {xCAT-client-2.0 => xCAT-client}/bin/rcons | 0 {xCAT-client-2.0 => xCAT-client}/bin/rinstall | 0 {xCAT-client-2.0 => xCAT-client}/bin/rspconfig | 0 {xCAT-client-2.0 => xCAT-client}/bin/switchblade | 0 {xCAT-client-2.0 => xCAT-client}/bin/wcons | 0 {xCAT-client-2.0 => xCAT-client}/bin/winstall | 0 {xCAT-client-2.0 => xCAT-client}/bin/wkill | 0 {xCAT-client-2.0 => xCAT-client}/bin/xCATWorld | 0 {xCAT-client-2.0 => xCAT-client}/bin/xcatDBcmds | 0 {xCAT-client-2.0 => xCAT-client}/bin/xcatclient | 0 {xCAT-client-2.0 => xCAT-client}/bin/xcatclientnnr | 0 {xCAT-client-2.0 => xCAT-client}/bin/xcoll | 0 {xCAT-client-2.0 => xCAT-client}/bin/xdsh | 0 {xCAT-client-2.0 => xCAT-client}/bin/xdshbak | 0 {xCAT-client-2.0 => xCAT-client}/bin/xtcd.pl | 0 {xCAT-client-2.0 => xCAT-client}/debian/changelog | 0 {xCAT-client-2.0 => xCAT-client}/debian/compat | 0 {xCAT-client-2.0 => xCAT-client}/debian/control | 0 .../debian/control.template | 0 {xCAT-client-2.0 => xCAT-client}/debian/copyright | 0 {xCAT-client-2.0 => xCAT-client}/debian/dirs | 0 {xCAT-client-2.0 => xCAT-client}/debian/docs | 0 {xCAT-client-2.0 => xCAT-client}/debian/files | 0 {xCAT-client-2.0 => xCAT-client}/debian/rules | 0 .../debian/xcat-client.install | 0 .../debian/xcat-client.links | 0 .../debian/xcat-client.substvars | 0 .../pods/man1/chdef.1.pod | 0 .../pods/man1/chvm.1.pod | 0 .../pods/man1/dumpxCATdb.1.pod | 0 .../pods/man1/genimage.1.pod | 0 .../pods/man1/getmacs.1.pod | 0 .../pods/man1/gettab.1.pod | 0 .../pods/man1/lsdef.1.pod | 0 .../pods/man1/lsslp.1.pod | 0 .../pods/man1/lsvm.1.pod | 0 .../pods/man1/mkdef.1.pod | 0 .../pods/man1/mkvm.1.pod | 0 .../pods/man1/monls.1.pod | 0 .../pods/man1/monstart.1.pod | 0 .../pods/man1/monstop.1.pod | 0 .../pods/man1/nodech.1.pod | 0 .../pods/man1/nodels.1.pod | 0 .../pods/man1/noderm.1.pod | 0 .../pods/man1/nodestat.1.pod | 0 .../pods/man1/packimage.1.pod | 0 .../pods/man1/pbstop.1.pod | 0 .../pods/man1/pcons.1.pod | 0 .../pods/man1/pping.1.pod | 0 .../pods/man1/ppping.1.pod | 0 .../pods/man1/prsync.1.pod | 0 .../pods/man1/pscp.1.pod | 0 .../pods/man1/psh.1.pod | 0 .../pods/man1/rbeacon.1.pod | 0 .../pods/man1/rbootseq.1.pod | 0 .../pods/man1/rcons.1.pod | 0 .../pods/man1/regnotif.1.pod | 0 .../pods/man1/restorexCATdb.1.pod | 0 .../pods/man1/reventlog.1.pod | 0 .../pods/man1/rinv.1.pod | 0 .../pods/man1/rmdef.1.pod | 0 .../pods/man1/rmvm.1.pod | 0 .../pods/man1/rnetboot.1.pod | 0 .../pods/man1/rpower.1.pod | 0 .../pods/man1/rscan.1.pod | 0 .../pods/man1/rsetboot.1.pod | 0 .../pods/man1/rspconfig.1.pod | 0 .../pods/man1/rspreset.1.pod | 0 .../pods/man1/rvitals.1.pod | 0 .../pods/man1/tabgrep.1.pod | 0 .../pods/man1/unregnotif.1.pod | 0 .../pods/man1/updateSNimage.1.pod | 0 .../pods/man1/wcons.1.pod | 0 .../pods/man1/wkill.1.pod | 0 .../pods/man1/xCATWorld.1.pod | 0 .../pods/man1/xcat2nim.1.pod | 0 .../pods/man1/xcoll.1.pod | 0 .../pods/man1/xdcp.1.pod | 0 .../pods/man1/xdsh.1.pod | 0 .../pods/man1/xdshbak.1.pod | 0 .../pods/man1/xpbsnodes.1.pod | 0 .../pods/man3/noderange.3.pod | 0 .../pods/man5/xcatstanzafile.5.pod | 0 .../pods/man8/chtab.8.pod | 0 .../pods/man8/copycds.8.pod | 0 .../pods/man8/makedhcp.8.pod | 0 .../pods/man8/makedns.8.pod | 0 .../pods/man8/makehosts.8.pod | 0 .../pods/man8/mkrrbc.8.pod | 0 .../pods/man8/mkrrnodes.8.pod | 0 .../pods/man8/nodeadd.8.pod | 0 .../pods/man8/nodeset.8.pod | 0 .../pods/man8/rinstall.8.pod | 0 .../pods/man8/tabdump.8.pod | 0 .../pods/man8/tabedit.8.pod | 0 .../pods/man8/tabrestore.8.pod | 0 .../pods/man8/winstall.8.pod | 0 {xCAT-client-2.0 => xCAT-client}/sbin/dumpxCATdb | 0 {xCAT-client-2.0 => xCAT-client}/sbin/restorexCATdb | 0 {xCAT-client-2.0 => xCAT-client}/sbin/tabedit | 0 {xCAT-client-2.0 => xCAT-client}/sbin/tabrestore | 0 .../share/doc/index.html | 0 .../share/doc/xCAT-iDpx.odt | Bin .../share/doc/xCAT-iDpx.pdf | Bin .../share/doc/xCAT2.0 uninstall.odt | Bin .../share/doc/xCAT2.0 uninstall.pdf | Bin .../share/doc/xCAT2.0-Monitoring.odt | Bin .../share/doc/xCAT2.0-Monitoring.pdf | Bin .../share/doc/xCAT2.0.odt | Bin .../share/doc/xCAT2.0.pdf | Bin .../share/doc/xCAT2onAIX.odt | Bin .../share/doc/xCAT2onAIX.pdf | Bin .../share/doc/xCAT2onAIXDiskless.odt | Bin .../share/doc/xCAT2onAIXDiskless.pdf | Bin {xCAT-client-2.0 => xCAT-client}/xCAT-client.spec | 0 {xCAT-client-2.0 => xCAT-client}/xpod2man | 0 {xCAT-server-2.0 => xCAT-server}/LICENSE.html | 0 {xCAT-server-2.0 => xCAT-server}/bin/replaycons | 0 {xCAT-server-2.0 => xCAT-server}/etc/init.d/xcatd | 0 .../etc/xcat/postscripts.rules | 0 .../lib/xcat/dsh/Context/DSH.pm | 0 .../lib/xcat/dsh/Context/XCAT.pm | 0 .../lib/xcat/monitoring/monitorctrl.pm | 0 .../lib/xcat/monitoring/montbhandler.pm | 0 .../lib/xcat/monitoring/samples/mycode.pm | 0 .../lib/xcat/monitoring/samples/templatemon.pm | 0 .../lib/xcat/monitoring/snmpmon.pm | 0 .../lib/xcat/monitoring/xcatmon.pm | 0 .../lib/xcat/plugins/AAsn.pm | 0 .../lib/xcat/plugins/CONSsn.pm | 0 .../lib/xcat/plugins/DBobjectdefs.pm | 0 .../lib/xcat/plugins/DHCPsn.pm | 0 .../lib/xcat/plugins/DNSsn.pm | 0 .../lib/xcat/plugins/FTPsn.pm | 0 .../lib/xcat/plugins/LDAPsn.pm | 0 .../lib/xcat/plugins/NFSsn.pm | 0 .../lib/xcat/plugins/NTPsn.pm | 0 .../lib/xcat/plugins/SSHsn.pm | 0 .../lib/xcat/plugins/TFTPsn.pm | 0 .../lib/xcat/plugins/aixdskls.pm | 0 .../lib/xcat/plugins/anaconda.pm | 0 .../lib/xcat/plugins/bind.pm | 0 .../lib/xcat/plugins/blade.pm | 0 .../lib/xcat/plugins/bmcconfig.pm | 0 .../lib/xcat/plugins/conserver.pm | 0 .../lib/xcat/plugins/copycds.pm | 0 .../lib/xcat/plugins/credentials.pm | 0 .../lib/xcat/plugins/destiny.pm | 0 .../lib/xcat/plugins/dhcp.pm | 0 .../lib/xcat/plugins/fsp.pm | 0 .../lib/xcat/plugins/getpostscript.pm | 0 .../lib/xcat/plugins/hmc.pm | 0 .../lib/xcat/plugins/hosts.pm | 0 .../lib/xcat/plugins/ipmi.pm | 0 .../lib/xcat/plugins/iscsi.pm | 0 .../lib/xcat/plugins/ivm.pm | 0 .../lib/xcat/plugins/lsslp.pm | 0 .../lib/xcat/plugins/mknb.pm | 0 .../lib/xcat/plugins/monctrlcmds.pm | 0 .../lib/xcat/plugins/networks.pm | 0 .../lib/xcat/plugins/nodediscover.pm | 0 .../lib/xcat/plugins/nodestat.pm | 0 .../lib/xcat/plugins/notification.pm | 0 .../lib/xcat/plugins/packimage.pm | 0 .../lib/xcat/plugins/pxe.pm | 0 .../lib/xcat/plugins/sles.pm | 0 .../lib/xcat/plugins/switch.pm | 0 .../lib/xcat/plugins/tabutils.pm | 0 .../lib/xcat/plugins/xCATWorld.pm | 0 .../lib/xcat/plugins/xcat2nim.pm | 0 .../lib/xcat/plugins/xdsh.pm | 0 .../lib/xcat/plugins/yaboot.pm | 0 .../lib/xcat/shfunctions | 0 {xCAT-server-2.0 => xCAT-server}/sbin/chtab | 0 {xCAT-server-2.0 => xCAT-server}/sbin/copycerts | 0 .../sbin/lpar_netboot.expect | 0 .../sbin/makenamed.conf | 0 {xCAT-server-2.0 => xCAT-server}/sbin/mknb | 0 .../sbin/remoteshell.expect | 0 {xCAT-server-2.0 => xCAT-server}/sbin/updateSNimage | 0 .../sbin/xcat_traphandler | 0 {xCAT-server-2.0 => xCAT-server}/sbin/xcatconfig | 0 {xCAT-server-2.0 => xCAT-server}/sbin/xcatd | 0 {xCAT-server-2.0 => xCAT-server}/sbin/xcatnodemon | 0 .../share/xcat/ca/Makefile | 0 .../share/xcat/ca/openssl.cnf.tmpl | 0 .../share/xcat/cons/blade | 0 .../share/xcat/cons/blade.expect | 0 .../share/xcat/cons/hmc | 0 .../share/xcat/cons/ipmi | 0 .../share/xcat/install/centos/all.tmpl | 0 .../share/xcat/install/centos/compute.tmpl | 0 .../share/xcat/install/centos/iscsi.tmpl | 0 .../xcat/install/fedora/compute.fedora9.ppc64.tmpl | 0 .../share/xcat/install/fedora/compute.fedora9.tmpl | 0 .../share/xcat/install/fedora/compute.ppc64.tmpl | 0 .../share/xcat/install/fedora/compute.tmpl | 0 .../xcat/install/fedora/iscsi.fedora9.ppc64.tmpl | 0 .../share/xcat/install/fedora/iscsi.fedora9.tmpl | 0 .../share/xcat/install/fedora/iscsi.ppc64.tmpl | 0 .../share/xcat/install/fedora/iscsi.tmpl | 0 .../xcat/install/fedora/service.fedora9.ppc64.tmpl | 0 .../share/xcat/install/fedora/service.fedora9.tmpl | 0 .../share/xcat/install/fedora/service.ppc64.tmpl | 0 .../share/xcat/install/fedora/service.tmpl | 0 .../share/xcat/install/rh/compute.ppc64.tmpl | 0 .../share/xcat/install/rh/compute.rhel4.tmpl | 0 .../share/xcat/install/rh/compute.tmpl | 0 .../share/xcat/install/rh/iscsi.ppc64.tmpl | 0 .../share/xcat/install/rh/iscsi.tmpl | 0 .../share/xcat/install/rh/service.tmpl | 0 .../share/xcat/install/scripts/chroot.sles | 0 .../share/xcat/install/scripts/chroot.sles.iscsi | 0 .../share/xcat/install/scripts/post.rh | 0 .../share/xcat/install/scripts/post.rh.iscsi | 0 .../share/xcat/install/scripts/post.sles | 0 .../share/xcat/install/scripts/post.sles.iscsi | 0 .../share/xcat/install/scripts/pre.rh | 0 .../share/xcat/install/scripts/pre.sles | 0 .../share/xcat/install/sles/compute.ppc64.tmpl | 0 .../share/xcat/install/sles/compute.tmpl | 0 .../share/xcat/install/sles/iscsi.tmpl | 0 .../share/xcat/netboot/add-on/stateless/stateless | 0 .../share/xcat/netboot/add-on/torque/add_torque | 0 .../share/xcat/netboot/add-on/torque/moab | 0 .../share/xcat/netboot/add-on/torque/moab.suse | 0 .../share/xcat/netboot/add-on/torque/pbs | 0 .../share/xcat/netboot/add-on/torque/pbs.suse | 0 .../share/xcat/netboot/add-on/torque/pbs_mom | 0 .../share/xcat/netboot/add-on/torque/pbs_mom.suse | 0 .../share/xcat/netboot/add-on/torque/pbs_sched | 0 .../share/xcat/netboot/add-on/torque/pbs_sched.suse | 0 .../share/xcat/netboot/add-on/torque/pbs_server | 0 .../xcat/netboot/add-on/torque/pbs_server.suse | 0 .../share/xcat/netboot/add-on/torque/pbsnodestat | 0 .../share/xcat/netboot/add-on/torque/pbstop | 0 .../xcat/netboot/add-on/torque/scripts/epilogue | 0 .../xcat/netboot/add-on/torque/scripts/killuser | 0 .../share/xcat/netboot/add-on/torque/scripts/pbspsh | 0 .../xcat/netboot/add-on/torque/scripts/prologue | 0 .../xcat/netboot/add-on/torque/scripts/setupnode | 0 .../xcat/netboot/add-on/torque/scripts/setupnode2 | 0 .../xcat/netboot/add-on/torque/scripts/takedownnode | 0 .../netboot/add-on/torque/scripts/takedownnode2 | 0 .../share/xcat/netboot/add-on/torque/xpbsnodes | 0 .../share/xcat/netboot/aix/xcatAIXpost | 0 .../share/xcat/netboot/centos/compute.exlist | 0 .../share/xcat/netboot/centos/compute.pkglist | 0 .../share/xcat/netboot/centos/genimage | 0 .../share/xcat/netboot/centos/geninitrd | 0 .../share/xcat/netboot/fedora/compute.exlist | 0 .../share/xcat/netboot/fedora/compute.pkglist | 0 .../share/xcat/netboot/fedora/compute.ppc64.pkglist | 0 .../share/xcat/netboot/fedora/genimage | 0 .../share/xcat/netboot/fedora/geninitrd | 0 .../share/xcat/netboot/fedora/service.exlist | 0 .../share/xcat/netboot/fedora/service.pkglist | 0 .../share/xcat/netboot/rh/compute.exlist | 0 .../share/xcat/netboot/rh/compute.pkglist | 0 .../share/xcat/netboot/rh/genimage | 0 .../share/xcat/netboot/rh/geninitrd | 0 .../share/xcat/netboot/rh/service.exlist | 0 .../share/xcat/netboot/rh/service.pkglist | 0 .../share/xcat/netboot/sles/compute.exlist | 0 .../share/xcat/netboot/sles/compute.pkglist | 0 .../share/xcat/netboot/sles/genimage | 0 .../share/xcat/netboot/sles/geninitrd | 0 .../share/xcat/netboot/sles/service.exlist | 0 .../share/xcat/netboot/sles/service.pkglist | 0 .../share/xcat/postscripts/enablesysreq | 0 .../share/xcat/postscripts/hardeths | 0 .../share/xcat/postscripts/reboot | 0 .../share/xcat/postscripts/remoteshell | 0 .../share/xcat/postscripts/resyslog | 0 .../share/xcat/postscripts/serialconsole | 0 .../share/xcat/postscripts/syslog | 0 .../share/xcat/postscripts/updateflag.awk | 0 .../share/xcat/scripts/bitscount.pl | 0 .../share/xcat/scripts/countbits.pl | 0 .../share/xcat/scripts/ipcalc.ksh | 0 .../share/xcat/scripts/setup-local-client.sh | 0 .../share/xcat/scripts/setup-server-cert.sh | 0 .../share/xcat/scripts/setup-xcat-ca.sh | 0 .../share/xcat/tools/cleanxCATaix | 0 .../share/xcat/tools/csm2xcatdefs | 0 .../share/xcat/tools/mkrrbc | 0 .../share/xcat/tools/mkrrnodes | 0 {xCAT-server-2.0 => xCAT-server}/xCAT-server.spec | 0 {xCAT-server-2.0 => xCAT-server}/xcatd.rc | 0 294 files changed, 0 insertions(+), 0 deletions(-) rename {xCAT-client-2.0 => xCAT-client}/LICENSE.html (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/pping (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/prsync (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/pscp (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/psh (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/rcons (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/rinstall (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/rspconfig (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/switchblade (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/wcons (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/winstall (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/wkill (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xCATWorld (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xcatDBcmds (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xcatclient (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xcatclientnnr (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xcoll (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xdsh (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xdshbak (100%) rename {xCAT-client-2.0 => xCAT-client}/bin/xtcd.pl (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/changelog (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/compat (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/control (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/control.template (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/copyright (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/dirs (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/docs (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/files (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/rules (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/xcat-client.install (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/xcat-client.links (100%) rename {xCAT-client-2.0 => xCAT-client}/debian/xcat-client.substvars (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/chdef.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/chvm.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/dumpxCATdb.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/genimage.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/getmacs.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/gettab.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/lsdef.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/lsslp.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/lsvm.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/mkdef.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/mkvm.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/monls.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/monstart.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/monstop.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/nodech.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/nodels.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/noderm.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/nodestat.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/packimage.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/pbstop.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/pcons.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/pping.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/ppping.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/prsync.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/pscp.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/psh.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rbeacon.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rbootseq.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rcons.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/regnotif.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/restorexCATdb.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/reventlog.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rinv.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rmdef.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rmvm.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rnetboot.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rpower.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rscan.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rsetboot.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rspconfig.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rspreset.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/rvitals.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/tabgrep.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/unregnotif.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/updateSNimage.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/wcons.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/wkill.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xCATWorld.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xcat2nim.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xcoll.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xdcp.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xdsh.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xdshbak.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man1/xpbsnodes.1.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man3/noderange.3.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man5/xcatstanzafile.5.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/chtab.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/copycds.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/makedhcp.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/makedns.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/makehosts.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/mkrrbc.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/mkrrnodes.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/nodeadd.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/nodeset.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/rinstall.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/tabdump.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/tabedit.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/tabrestore.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/pods/man8/winstall.8.pod (100%) rename {xCAT-client-2.0 => xCAT-client}/sbin/dumpxCATdb (100%) rename {xCAT-client-2.0 => xCAT-client}/sbin/restorexCATdb (100%) rename {xCAT-client-2.0 => xCAT-client}/sbin/tabedit (100%) rename {xCAT-client-2.0 => xCAT-client}/sbin/tabrestore (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/index.html (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT-iDpx.odt (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT-iDpx.pdf (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2.0 uninstall.odt (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2.0 uninstall.pdf (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2.0-Monitoring.odt (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2.0-Monitoring.pdf (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2.0.odt (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2.0.pdf (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2onAIX.odt (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2onAIX.pdf (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2onAIXDiskless.odt (100%) rename {xCAT-client-2.0 => xCAT-client}/share/doc/xCAT2onAIXDiskless.pdf (100%) rename {xCAT-client-2.0 => xCAT-client}/xCAT-client.spec (100%) rename {xCAT-client-2.0 => xCAT-client}/xpod2man (100%) rename {xCAT-server-2.0 => xCAT-server}/LICENSE.html (100%) rename {xCAT-server-2.0 => xCAT-server}/bin/replaycons (100%) rename {xCAT-server-2.0 => xCAT-server}/etc/init.d/xcatd (100%) rename {xCAT-server-2.0 => xCAT-server}/etc/xcat/postscripts.rules (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/dsh/Context/DSH.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/dsh/Context/XCAT.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/monitoring/monitorctrl.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/monitoring/montbhandler.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/monitoring/samples/mycode.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/monitoring/samples/templatemon.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/monitoring/snmpmon.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/monitoring/xcatmon.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/AAsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/CONSsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/DBobjectdefs.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/DHCPsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/DNSsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/FTPsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/LDAPsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/NFSsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/NTPsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/SSHsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/TFTPsn.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/aixdskls.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/anaconda.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/bind.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/blade.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/bmcconfig.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/conserver.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/copycds.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/credentials.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/destiny.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/dhcp.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/fsp.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/getpostscript.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/hmc.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/hosts.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/ipmi.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/iscsi.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/ivm.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/lsslp.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/mknb.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/monctrlcmds.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/networks.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/nodediscover.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/nodestat.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/notification.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/packimage.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/pxe.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/sles.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/switch.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/tabutils.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/xCATWorld.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/xcat2nim.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/xdsh.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/plugins/yaboot.pm (100%) rename {xCAT-server-2.0 => xCAT-server}/lib/xcat/shfunctions (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/chtab (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/copycerts (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/lpar_netboot.expect (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/makenamed.conf (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/mknb (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/remoteshell.expect (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/updateSNimage (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/xcat_traphandler (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/xcatconfig (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/xcatd (100%) rename {xCAT-server-2.0 => xCAT-server}/sbin/xcatnodemon (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/ca/Makefile (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/ca/openssl.cnf.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/cons/blade (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/cons/blade.expect (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/cons/hmc (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/cons/ipmi (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/centos/all.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/centos/compute.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/centos/iscsi.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/compute.fedora9.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/compute.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/compute.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/iscsi.fedora9.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/iscsi.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/iscsi.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/service.fedora9.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/service.fedora9.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/service.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/fedora/service.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/rh/compute.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/rh/compute.rhel4.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/rh/compute.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/rh/iscsi.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/rh/iscsi.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/rh/service.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/chroot.sles (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/chroot.sles.iscsi (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/post.rh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/post.rh.iscsi (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/post.sles (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/post.sles.iscsi (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/pre.rh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/scripts/pre.sles (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/sles/compute.ppc64.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/sles/compute.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/install/sles/iscsi.tmpl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/stateless/stateless (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/add_torque (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/moab (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/moab.suse (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs.suse (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs_mom (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs_mom.suse (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs_sched (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs_sched.suse (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs_server (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbs_server.suse (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbsnodestat (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/pbstop (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/epilogue (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/killuser (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/pbspsh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/prologue (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/setupnode (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/setupnode2 (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/takedownnode (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/scripts/takedownnode2 (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/add-on/torque/xpbsnodes (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/aix/xcatAIXpost (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/centos/compute.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/centos/compute.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/centos/genimage (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/centos/geninitrd (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/compute.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/compute.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/compute.ppc64.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/genimage (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/geninitrd (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/service.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/fedora/service.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/rh/compute.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/rh/compute.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/rh/genimage (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/rh/geninitrd (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/rh/service.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/rh/service.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/sles/compute.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/sles/compute.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/sles/genimage (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/sles/geninitrd (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/sles/service.exlist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/netboot/sles/service.pkglist (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/enablesysreq (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/hardeths (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/reboot (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/remoteshell (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/resyslog (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/serialconsole (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/syslog (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/postscripts/updateflag.awk (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/scripts/bitscount.pl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/scripts/countbits.pl (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/scripts/ipcalc.ksh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/scripts/setup-local-client.sh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/scripts/setup-server-cert.sh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/scripts/setup-xcat-ca.sh (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/tools/cleanxCATaix (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/tools/csm2xcatdefs (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/tools/mkrrbc (100%) rename {xCAT-server-2.0 => xCAT-server}/share/xcat/tools/mkrrnodes (100%) rename {xCAT-server-2.0 => xCAT-server}/xCAT-server.spec (100%) rename {xCAT-server-2.0 => xCAT-server}/xcatd.rc (100%) diff --git a/xCAT-client-2.0/LICENSE.html b/xCAT-client/LICENSE.html similarity index 100% rename from xCAT-client-2.0/LICENSE.html rename to xCAT-client/LICENSE.html diff --git a/xCAT-client-2.0/bin/pping b/xCAT-client/bin/pping similarity index 100% rename from xCAT-client-2.0/bin/pping rename to xCAT-client/bin/pping diff --git a/xCAT-client-2.0/bin/prsync b/xCAT-client/bin/prsync similarity index 100% rename from xCAT-client-2.0/bin/prsync rename to xCAT-client/bin/prsync diff --git a/xCAT-client-2.0/bin/pscp b/xCAT-client/bin/pscp similarity index 100% rename from xCAT-client-2.0/bin/pscp rename to xCAT-client/bin/pscp diff --git a/xCAT-client-2.0/bin/psh b/xCAT-client/bin/psh similarity index 100% rename from xCAT-client-2.0/bin/psh rename to xCAT-client/bin/psh diff --git a/xCAT-client-2.0/bin/rcons b/xCAT-client/bin/rcons similarity index 100% rename from xCAT-client-2.0/bin/rcons rename to xCAT-client/bin/rcons diff --git a/xCAT-client-2.0/bin/rinstall b/xCAT-client/bin/rinstall similarity index 100% rename from xCAT-client-2.0/bin/rinstall rename to xCAT-client/bin/rinstall diff --git a/xCAT-client-2.0/bin/rspconfig b/xCAT-client/bin/rspconfig similarity index 100% rename from xCAT-client-2.0/bin/rspconfig rename to xCAT-client/bin/rspconfig diff --git a/xCAT-client-2.0/bin/switchblade b/xCAT-client/bin/switchblade similarity index 100% rename from xCAT-client-2.0/bin/switchblade rename to xCAT-client/bin/switchblade diff --git a/xCAT-client-2.0/bin/wcons b/xCAT-client/bin/wcons similarity index 100% rename from xCAT-client-2.0/bin/wcons rename to xCAT-client/bin/wcons diff --git a/xCAT-client-2.0/bin/winstall b/xCAT-client/bin/winstall similarity index 100% rename from xCAT-client-2.0/bin/winstall rename to xCAT-client/bin/winstall diff --git a/xCAT-client-2.0/bin/wkill b/xCAT-client/bin/wkill similarity index 100% rename from xCAT-client-2.0/bin/wkill rename to xCAT-client/bin/wkill diff --git a/xCAT-client-2.0/bin/xCATWorld b/xCAT-client/bin/xCATWorld similarity index 100% rename from xCAT-client-2.0/bin/xCATWorld rename to xCAT-client/bin/xCATWorld diff --git a/xCAT-client-2.0/bin/xcatDBcmds b/xCAT-client/bin/xcatDBcmds similarity index 100% rename from xCAT-client-2.0/bin/xcatDBcmds rename to xCAT-client/bin/xcatDBcmds diff --git a/xCAT-client-2.0/bin/xcatclient b/xCAT-client/bin/xcatclient similarity index 100% rename from xCAT-client-2.0/bin/xcatclient rename to xCAT-client/bin/xcatclient diff --git a/xCAT-client-2.0/bin/xcatclientnnr b/xCAT-client/bin/xcatclientnnr similarity index 100% rename from xCAT-client-2.0/bin/xcatclientnnr rename to xCAT-client/bin/xcatclientnnr diff --git a/xCAT-client-2.0/bin/xcoll b/xCAT-client/bin/xcoll similarity index 100% rename from xCAT-client-2.0/bin/xcoll rename to xCAT-client/bin/xcoll diff --git a/xCAT-client-2.0/bin/xdsh b/xCAT-client/bin/xdsh similarity index 100% rename from xCAT-client-2.0/bin/xdsh rename to xCAT-client/bin/xdsh diff --git a/xCAT-client-2.0/bin/xdshbak b/xCAT-client/bin/xdshbak similarity index 100% rename from xCAT-client-2.0/bin/xdshbak rename to xCAT-client/bin/xdshbak diff --git a/xCAT-client-2.0/bin/xtcd.pl b/xCAT-client/bin/xtcd.pl similarity index 100% rename from xCAT-client-2.0/bin/xtcd.pl rename to xCAT-client/bin/xtcd.pl diff --git a/xCAT-client-2.0/debian/changelog b/xCAT-client/debian/changelog similarity index 100% rename from xCAT-client-2.0/debian/changelog rename to xCAT-client/debian/changelog diff --git a/xCAT-client-2.0/debian/compat b/xCAT-client/debian/compat similarity index 100% rename from xCAT-client-2.0/debian/compat rename to xCAT-client/debian/compat diff --git a/xCAT-client-2.0/debian/control b/xCAT-client/debian/control similarity index 100% rename from xCAT-client-2.0/debian/control rename to xCAT-client/debian/control diff --git a/xCAT-client-2.0/debian/control.template b/xCAT-client/debian/control.template similarity index 100% rename from xCAT-client-2.0/debian/control.template rename to xCAT-client/debian/control.template diff --git a/xCAT-client-2.0/debian/copyright b/xCAT-client/debian/copyright similarity index 100% rename from xCAT-client-2.0/debian/copyright rename to xCAT-client/debian/copyright diff --git a/xCAT-client-2.0/debian/dirs b/xCAT-client/debian/dirs similarity index 100% rename from xCAT-client-2.0/debian/dirs rename to xCAT-client/debian/dirs diff --git a/xCAT-client-2.0/debian/docs b/xCAT-client/debian/docs similarity index 100% rename from xCAT-client-2.0/debian/docs rename to xCAT-client/debian/docs diff --git a/xCAT-client-2.0/debian/files b/xCAT-client/debian/files similarity index 100% rename from xCAT-client-2.0/debian/files rename to xCAT-client/debian/files diff --git a/xCAT-client-2.0/debian/rules b/xCAT-client/debian/rules similarity index 100% rename from xCAT-client-2.0/debian/rules rename to xCAT-client/debian/rules diff --git a/xCAT-client-2.0/debian/xcat-client.install b/xCAT-client/debian/xcat-client.install similarity index 100% rename from xCAT-client-2.0/debian/xcat-client.install rename to xCAT-client/debian/xcat-client.install diff --git a/xCAT-client-2.0/debian/xcat-client.links b/xCAT-client/debian/xcat-client.links similarity index 100% rename from xCAT-client-2.0/debian/xcat-client.links rename to xCAT-client/debian/xcat-client.links diff --git a/xCAT-client-2.0/debian/xcat-client.substvars b/xCAT-client/debian/xcat-client.substvars similarity index 100% rename from xCAT-client-2.0/debian/xcat-client.substvars rename to xCAT-client/debian/xcat-client.substvars diff --git a/xCAT-client-2.0/pods/man1/chdef.1.pod b/xCAT-client/pods/man1/chdef.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/chdef.1.pod rename to xCAT-client/pods/man1/chdef.1.pod diff --git a/xCAT-client-2.0/pods/man1/chvm.1.pod b/xCAT-client/pods/man1/chvm.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/chvm.1.pod rename to xCAT-client/pods/man1/chvm.1.pod diff --git a/xCAT-client-2.0/pods/man1/dumpxCATdb.1.pod b/xCAT-client/pods/man1/dumpxCATdb.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/dumpxCATdb.1.pod rename to xCAT-client/pods/man1/dumpxCATdb.1.pod diff --git a/xCAT-client-2.0/pods/man1/genimage.1.pod b/xCAT-client/pods/man1/genimage.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/genimage.1.pod rename to xCAT-client/pods/man1/genimage.1.pod diff --git a/xCAT-client-2.0/pods/man1/getmacs.1.pod b/xCAT-client/pods/man1/getmacs.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/getmacs.1.pod rename to xCAT-client/pods/man1/getmacs.1.pod diff --git a/xCAT-client-2.0/pods/man1/gettab.1.pod b/xCAT-client/pods/man1/gettab.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/gettab.1.pod rename to xCAT-client/pods/man1/gettab.1.pod diff --git a/xCAT-client-2.0/pods/man1/lsdef.1.pod b/xCAT-client/pods/man1/lsdef.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/lsdef.1.pod rename to xCAT-client/pods/man1/lsdef.1.pod diff --git a/xCAT-client-2.0/pods/man1/lsslp.1.pod b/xCAT-client/pods/man1/lsslp.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/lsslp.1.pod rename to xCAT-client/pods/man1/lsslp.1.pod diff --git a/xCAT-client-2.0/pods/man1/lsvm.1.pod b/xCAT-client/pods/man1/lsvm.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/lsvm.1.pod rename to xCAT-client/pods/man1/lsvm.1.pod diff --git a/xCAT-client-2.0/pods/man1/mkdef.1.pod b/xCAT-client/pods/man1/mkdef.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/mkdef.1.pod rename to xCAT-client/pods/man1/mkdef.1.pod diff --git a/xCAT-client-2.0/pods/man1/mkvm.1.pod b/xCAT-client/pods/man1/mkvm.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/mkvm.1.pod rename to xCAT-client/pods/man1/mkvm.1.pod diff --git a/xCAT-client-2.0/pods/man1/monls.1.pod b/xCAT-client/pods/man1/monls.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/monls.1.pod rename to xCAT-client/pods/man1/monls.1.pod diff --git a/xCAT-client-2.0/pods/man1/monstart.1.pod b/xCAT-client/pods/man1/monstart.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/monstart.1.pod rename to xCAT-client/pods/man1/monstart.1.pod diff --git a/xCAT-client-2.0/pods/man1/monstop.1.pod b/xCAT-client/pods/man1/monstop.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/monstop.1.pod rename to xCAT-client/pods/man1/monstop.1.pod diff --git a/xCAT-client-2.0/pods/man1/nodech.1.pod b/xCAT-client/pods/man1/nodech.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/nodech.1.pod rename to xCAT-client/pods/man1/nodech.1.pod diff --git a/xCAT-client-2.0/pods/man1/nodels.1.pod b/xCAT-client/pods/man1/nodels.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/nodels.1.pod rename to xCAT-client/pods/man1/nodels.1.pod diff --git a/xCAT-client-2.0/pods/man1/noderm.1.pod b/xCAT-client/pods/man1/noderm.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/noderm.1.pod rename to xCAT-client/pods/man1/noderm.1.pod diff --git a/xCAT-client-2.0/pods/man1/nodestat.1.pod b/xCAT-client/pods/man1/nodestat.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/nodestat.1.pod rename to xCAT-client/pods/man1/nodestat.1.pod diff --git a/xCAT-client-2.0/pods/man1/packimage.1.pod b/xCAT-client/pods/man1/packimage.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/packimage.1.pod rename to xCAT-client/pods/man1/packimage.1.pod diff --git a/xCAT-client-2.0/pods/man1/pbstop.1.pod b/xCAT-client/pods/man1/pbstop.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/pbstop.1.pod rename to xCAT-client/pods/man1/pbstop.1.pod diff --git a/xCAT-client-2.0/pods/man1/pcons.1.pod b/xCAT-client/pods/man1/pcons.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/pcons.1.pod rename to xCAT-client/pods/man1/pcons.1.pod diff --git a/xCAT-client-2.0/pods/man1/pping.1.pod b/xCAT-client/pods/man1/pping.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/pping.1.pod rename to xCAT-client/pods/man1/pping.1.pod diff --git a/xCAT-client-2.0/pods/man1/ppping.1.pod b/xCAT-client/pods/man1/ppping.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/ppping.1.pod rename to xCAT-client/pods/man1/ppping.1.pod diff --git a/xCAT-client-2.0/pods/man1/prsync.1.pod b/xCAT-client/pods/man1/prsync.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/prsync.1.pod rename to xCAT-client/pods/man1/prsync.1.pod diff --git a/xCAT-client-2.0/pods/man1/pscp.1.pod b/xCAT-client/pods/man1/pscp.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/pscp.1.pod rename to xCAT-client/pods/man1/pscp.1.pod diff --git a/xCAT-client-2.0/pods/man1/psh.1.pod b/xCAT-client/pods/man1/psh.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/psh.1.pod rename to xCAT-client/pods/man1/psh.1.pod diff --git a/xCAT-client-2.0/pods/man1/rbeacon.1.pod b/xCAT-client/pods/man1/rbeacon.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rbeacon.1.pod rename to xCAT-client/pods/man1/rbeacon.1.pod diff --git a/xCAT-client-2.0/pods/man1/rbootseq.1.pod b/xCAT-client/pods/man1/rbootseq.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rbootseq.1.pod rename to xCAT-client/pods/man1/rbootseq.1.pod diff --git a/xCAT-client-2.0/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rcons.1.pod rename to xCAT-client/pods/man1/rcons.1.pod diff --git a/xCAT-client-2.0/pods/man1/regnotif.1.pod b/xCAT-client/pods/man1/regnotif.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/regnotif.1.pod rename to xCAT-client/pods/man1/regnotif.1.pod diff --git a/xCAT-client-2.0/pods/man1/restorexCATdb.1.pod b/xCAT-client/pods/man1/restorexCATdb.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/restorexCATdb.1.pod rename to xCAT-client/pods/man1/restorexCATdb.1.pod diff --git a/xCAT-client-2.0/pods/man1/reventlog.1.pod b/xCAT-client/pods/man1/reventlog.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/reventlog.1.pod rename to xCAT-client/pods/man1/reventlog.1.pod diff --git a/xCAT-client-2.0/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rinv.1.pod rename to xCAT-client/pods/man1/rinv.1.pod diff --git a/xCAT-client-2.0/pods/man1/rmdef.1.pod b/xCAT-client/pods/man1/rmdef.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rmdef.1.pod rename to xCAT-client/pods/man1/rmdef.1.pod diff --git a/xCAT-client-2.0/pods/man1/rmvm.1.pod b/xCAT-client/pods/man1/rmvm.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rmvm.1.pod rename to xCAT-client/pods/man1/rmvm.1.pod diff --git a/xCAT-client-2.0/pods/man1/rnetboot.1.pod b/xCAT-client/pods/man1/rnetboot.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rnetboot.1.pod rename to xCAT-client/pods/man1/rnetboot.1.pod diff --git a/xCAT-client-2.0/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rpower.1.pod rename to xCAT-client/pods/man1/rpower.1.pod diff --git a/xCAT-client-2.0/pods/man1/rscan.1.pod b/xCAT-client/pods/man1/rscan.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rscan.1.pod rename to xCAT-client/pods/man1/rscan.1.pod diff --git a/xCAT-client-2.0/pods/man1/rsetboot.1.pod b/xCAT-client/pods/man1/rsetboot.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rsetboot.1.pod rename to xCAT-client/pods/man1/rsetboot.1.pod diff --git a/xCAT-client-2.0/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rspconfig.1.pod rename to xCAT-client/pods/man1/rspconfig.1.pod diff --git a/xCAT-client-2.0/pods/man1/rspreset.1.pod b/xCAT-client/pods/man1/rspreset.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rspreset.1.pod rename to xCAT-client/pods/man1/rspreset.1.pod diff --git a/xCAT-client-2.0/pods/man1/rvitals.1.pod b/xCAT-client/pods/man1/rvitals.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/rvitals.1.pod rename to xCAT-client/pods/man1/rvitals.1.pod diff --git a/xCAT-client-2.0/pods/man1/tabgrep.1.pod b/xCAT-client/pods/man1/tabgrep.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/tabgrep.1.pod rename to xCAT-client/pods/man1/tabgrep.1.pod diff --git a/xCAT-client-2.0/pods/man1/unregnotif.1.pod b/xCAT-client/pods/man1/unregnotif.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/unregnotif.1.pod rename to xCAT-client/pods/man1/unregnotif.1.pod diff --git a/xCAT-client-2.0/pods/man1/updateSNimage.1.pod b/xCAT-client/pods/man1/updateSNimage.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/updateSNimage.1.pod rename to xCAT-client/pods/man1/updateSNimage.1.pod diff --git a/xCAT-client-2.0/pods/man1/wcons.1.pod b/xCAT-client/pods/man1/wcons.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/wcons.1.pod rename to xCAT-client/pods/man1/wcons.1.pod diff --git a/xCAT-client-2.0/pods/man1/wkill.1.pod b/xCAT-client/pods/man1/wkill.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/wkill.1.pod rename to xCAT-client/pods/man1/wkill.1.pod diff --git a/xCAT-client-2.0/pods/man1/xCATWorld.1.pod b/xCAT-client/pods/man1/xCATWorld.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xCATWorld.1.pod rename to xCAT-client/pods/man1/xCATWorld.1.pod diff --git a/xCAT-client-2.0/pods/man1/xcat2nim.1.pod b/xCAT-client/pods/man1/xcat2nim.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xcat2nim.1.pod rename to xCAT-client/pods/man1/xcat2nim.1.pod diff --git a/xCAT-client-2.0/pods/man1/xcoll.1.pod b/xCAT-client/pods/man1/xcoll.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xcoll.1.pod rename to xCAT-client/pods/man1/xcoll.1.pod diff --git a/xCAT-client-2.0/pods/man1/xdcp.1.pod b/xCAT-client/pods/man1/xdcp.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xdcp.1.pod rename to xCAT-client/pods/man1/xdcp.1.pod diff --git a/xCAT-client-2.0/pods/man1/xdsh.1.pod b/xCAT-client/pods/man1/xdsh.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xdsh.1.pod rename to xCAT-client/pods/man1/xdsh.1.pod diff --git a/xCAT-client-2.0/pods/man1/xdshbak.1.pod b/xCAT-client/pods/man1/xdshbak.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xdshbak.1.pod rename to xCAT-client/pods/man1/xdshbak.1.pod diff --git a/xCAT-client-2.0/pods/man1/xpbsnodes.1.pod b/xCAT-client/pods/man1/xpbsnodes.1.pod similarity index 100% rename from xCAT-client-2.0/pods/man1/xpbsnodes.1.pod rename to xCAT-client/pods/man1/xpbsnodes.1.pod diff --git a/xCAT-client-2.0/pods/man3/noderange.3.pod b/xCAT-client/pods/man3/noderange.3.pod similarity index 100% rename from xCAT-client-2.0/pods/man3/noderange.3.pod rename to xCAT-client/pods/man3/noderange.3.pod diff --git a/xCAT-client-2.0/pods/man5/xcatstanzafile.5.pod b/xCAT-client/pods/man5/xcatstanzafile.5.pod similarity index 100% rename from xCAT-client-2.0/pods/man5/xcatstanzafile.5.pod rename to xCAT-client/pods/man5/xcatstanzafile.5.pod diff --git a/xCAT-client-2.0/pods/man8/chtab.8.pod b/xCAT-client/pods/man8/chtab.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/chtab.8.pod rename to xCAT-client/pods/man8/chtab.8.pod diff --git a/xCAT-client-2.0/pods/man8/copycds.8.pod b/xCAT-client/pods/man8/copycds.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/copycds.8.pod rename to xCAT-client/pods/man8/copycds.8.pod diff --git a/xCAT-client-2.0/pods/man8/makedhcp.8.pod b/xCAT-client/pods/man8/makedhcp.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/makedhcp.8.pod rename to xCAT-client/pods/man8/makedhcp.8.pod diff --git a/xCAT-client-2.0/pods/man8/makedns.8.pod b/xCAT-client/pods/man8/makedns.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/makedns.8.pod rename to xCAT-client/pods/man8/makedns.8.pod diff --git a/xCAT-client-2.0/pods/man8/makehosts.8.pod b/xCAT-client/pods/man8/makehosts.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/makehosts.8.pod rename to xCAT-client/pods/man8/makehosts.8.pod diff --git a/xCAT-client-2.0/pods/man8/mkrrbc.8.pod b/xCAT-client/pods/man8/mkrrbc.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/mkrrbc.8.pod rename to xCAT-client/pods/man8/mkrrbc.8.pod diff --git a/xCAT-client-2.0/pods/man8/mkrrnodes.8.pod b/xCAT-client/pods/man8/mkrrnodes.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/mkrrnodes.8.pod rename to xCAT-client/pods/man8/mkrrnodes.8.pod diff --git a/xCAT-client-2.0/pods/man8/nodeadd.8.pod b/xCAT-client/pods/man8/nodeadd.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/nodeadd.8.pod rename to xCAT-client/pods/man8/nodeadd.8.pod diff --git a/xCAT-client-2.0/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/nodeset.8.pod rename to xCAT-client/pods/man8/nodeset.8.pod diff --git a/xCAT-client-2.0/pods/man8/rinstall.8.pod b/xCAT-client/pods/man8/rinstall.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/rinstall.8.pod rename to xCAT-client/pods/man8/rinstall.8.pod diff --git a/xCAT-client-2.0/pods/man8/tabdump.8.pod b/xCAT-client/pods/man8/tabdump.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/tabdump.8.pod rename to xCAT-client/pods/man8/tabdump.8.pod diff --git a/xCAT-client-2.0/pods/man8/tabedit.8.pod b/xCAT-client/pods/man8/tabedit.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/tabedit.8.pod rename to xCAT-client/pods/man8/tabedit.8.pod diff --git a/xCAT-client-2.0/pods/man8/tabrestore.8.pod b/xCAT-client/pods/man8/tabrestore.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/tabrestore.8.pod rename to xCAT-client/pods/man8/tabrestore.8.pod diff --git a/xCAT-client-2.0/pods/man8/winstall.8.pod b/xCAT-client/pods/man8/winstall.8.pod similarity index 100% rename from xCAT-client-2.0/pods/man8/winstall.8.pod rename to xCAT-client/pods/man8/winstall.8.pod diff --git a/xCAT-client-2.0/sbin/dumpxCATdb b/xCAT-client/sbin/dumpxCATdb similarity index 100% rename from xCAT-client-2.0/sbin/dumpxCATdb rename to xCAT-client/sbin/dumpxCATdb diff --git a/xCAT-client-2.0/sbin/restorexCATdb b/xCAT-client/sbin/restorexCATdb similarity index 100% rename from xCAT-client-2.0/sbin/restorexCATdb rename to xCAT-client/sbin/restorexCATdb diff --git a/xCAT-client-2.0/sbin/tabedit b/xCAT-client/sbin/tabedit similarity index 100% rename from xCAT-client-2.0/sbin/tabedit rename to xCAT-client/sbin/tabedit diff --git a/xCAT-client-2.0/sbin/tabrestore b/xCAT-client/sbin/tabrestore similarity index 100% rename from xCAT-client-2.0/sbin/tabrestore rename to xCAT-client/sbin/tabrestore diff --git a/xCAT-client-2.0/share/doc/index.html b/xCAT-client/share/doc/index.html similarity index 100% rename from xCAT-client-2.0/share/doc/index.html rename to xCAT-client/share/doc/index.html diff --git a/xCAT-client-2.0/share/doc/xCAT-iDpx.odt b/xCAT-client/share/doc/xCAT-iDpx.odt similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT-iDpx.odt rename to xCAT-client/share/doc/xCAT-iDpx.odt diff --git a/xCAT-client-2.0/share/doc/xCAT-iDpx.pdf b/xCAT-client/share/doc/xCAT-iDpx.pdf similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT-iDpx.pdf rename to xCAT-client/share/doc/xCAT-iDpx.pdf diff --git a/xCAT-client-2.0/share/doc/xCAT2.0 uninstall.odt b/xCAT-client/share/doc/xCAT2.0 uninstall.odt similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2.0 uninstall.odt rename to xCAT-client/share/doc/xCAT2.0 uninstall.odt diff --git a/xCAT-client-2.0/share/doc/xCAT2.0 uninstall.pdf b/xCAT-client/share/doc/xCAT2.0 uninstall.pdf similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2.0 uninstall.pdf rename to xCAT-client/share/doc/xCAT2.0 uninstall.pdf diff --git a/xCAT-client-2.0/share/doc/xCAT2.0-Monitoring.odt b/xCAT-client/share/doc/xCAT2.0-Monitoring.odt similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2.0-Monitoring.odt rename to xCAT-client/share/doc/xCAT2.0-Monitoring.odt diff --git a/xCAT-client-2.0/share/doc/xCAT2.0-Monitoring.pdf b/xCAT-client/share/doc/xCAT2.0-Monitoring.pdf similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2.0-Monitoring.pdf rename to xCAT-client/share/doc/xCAT2.0-Monitoring.pdf diff --git a/xCAT-client-2.0/share/doc/xCAT2.0.odt b/xCAT-client/share/doc/xCAT2.0.odt similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2.0.odt rename to xCAT-client/share/doc/xCAT2.0.odt diff --git a/xCAT-client-2.0/share/doc/xCAT2.0.pdf b/xCAT-client/share/doc/xCAT2.0.pdf similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2.0.pdf rename to xCAT-client/share/doc/xCAT2.0.pdf diff --git a/xCAT-client-2.0/share/doc/xCAT2onAIX.odt b/xCAT-client/share/doc/xCAT2onAIX.odt similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2onAIX.odt rename to xCAT-client/share/doc/xCAT2onAIX.odt diff --git a/xCAT-client-2.0/share/doc/xCAT2onAIX.pdf b/xCAT-client/share/doc/xCAT2onAIX.pdf similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2onAIX.pdf rename to xCAT-client/share/doc/xCAT2onAIX.pdf diff --git a/xCAT-client-2.0/share/doc/xCAT2onAIXDiskless.odt b/xCAT-client/share/doc/xCAT2onAIXDiskless.odt similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2onAIXDiskless.odt rename to xCAT-client/share/doc/xCAT2onAIXDiskless.odt diff --git a/xCAT-client-2.0/share/doc/xCAT2onAIXDiskless.pdf b/xCAT-client/share/doc/xCAT2onAIXDiskless.pdf similarity index 100% rename from xCAT-client-2.0/share/doc/xCAT2onAIXDiskless.pdf rename to xCAT-client/share/doc/xCAT2onAIXDiskless.pdf diff --git a/xCAT-client-2.0/xCAT-client.spec b/xCAT-client/xCAT-client.spec similarity index 100% rename from xCAT-client-2.0/xCAT-client.spec rename to xCAT-client/xCAT-client.spec diff --git a/xCAT-client-2.0/xpod2man b/xCAT-client/xpod2man similarity index 100% rename from xCAT-client-2.0/xpod2man rename to xCAT-client/xpod2man diff --git a/xCAT-server-2.0/LICENSE.html b/xCAT-server/LICENSE.html similarity index 100% rename from xCAT-server-2.0/LICENSE.html rename to xCAT-server/LICENSE.html diff --git a/xCAT-server-2.0/bin/replaycons b/xCAT-server/bin/replaycons similarity index 100% rename from xCAT-server-2.0/bin/replaycons rename to xCAT-server/bin/replaycons diff --git a/xCAT-server-2.0/etc/init.d/xcatd b/xCAT-server/etc/init.d/xcatd similarity index 100% rename from xCAT-server-2.0/etc/init.d/xcatd rename to xCAT-server/etc/init.d/xcatd diff --git a/xCAT-server-2.0/etc/xcat/postscripts.rules b/xCAT-server/etc/xcat/postscripts.rules similarity index 100% rename from xCAT-server-2.0/etc/xcat/postscripts.rules rename to xCAT-server/etc/xcat/postscripts.rules diff --git a/xCAT-server-2.0/lib/xcat/dsh/Context/DSH.pm b/xCAT-server/lib/xcat/dsh/Context/DSH.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/dsh/Context/DSH.pm rename to xCAT-server/lib/xcat/dsh/Context/DSH.pm diff --git a/xCAT-server-2.0/lib/xcat/dsh/Context/XCAT.pm b/xCAT-server/lib/xcat/dsh/Context/XCAT.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/dsh/Context/XCAT.pm rename to xCAT-server/lib/xcat/dsh/Context/XCAT.pm diff --git a/xCAT-server-2.0/lib/xcat/monitoring/monitorctrl.pm b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/monitoring/monitorctrl.pm rename to xCAT-server/lib/xcat/monitoring/monitorctrl.pm diff --git a/xCAT-server-2.0/lib/xcat/monitoring/montbhandler.pm b/xCAT-server/lib/xcat/monitoring/montbhandler.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/monitoring/montbhandler.pm rename to xCAT-server/lib/xcat/monitoring/montbhandler.pm diff --git a/xCAT-server-2.0/lib/xcat/monitoring/samples/mycode.pm b/xCAT-server/lib/xcat/monitoring/samples/mycode.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/monitoring/samples/mycode.pm rename to xCAT-server/lib/xcat/monitoring/samples/mycode.pm diff --git a/xCAT-server-2.0/lib/xcat/monitoring/samples/templatemon.pm b/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/monitoring/samples/templatemon.pm rename to xCAT-server/lib/xcat/monitoring/samples/templatemon.pm diff --git a/xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm b/xCAT-server/lib/xcat/monitoring/snmpmon.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm rename to xCAT-server/lib/xcat/monitoring/snmpmon.pm diff --git a/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm b/xCAT-server/lib/xcat/monitoring/xcatmon.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm rename to xCAT-server/lib/xcat/monitoring/xcatmon.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/AAsn.pm rename to xCAT-server/lib/xcat/plugins/AAsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm b/xCAT-server/lib/xcat/plugins/CONSsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm rename to xCAT-server/lib/xcat/plugins/CONSsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/DBobjectdefs.pm rename to xCAT-server/lib/xcat/plugins/DBobjectdefs.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/DHCPsn.pm b/xCAT-server/lib/xcat/plugins/DHCPsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/DHCPsn.pm rename to xCAT-server/lib/xcat/plugins/DHCPsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm b/xCAT-server/lib/xcat/plugins/DNSsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm rename to xCAT-server/lib/xcat/plugins/DNSsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/FTPsn.pm b/xCAT-server/lib/xcat/plugins/FTPsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/FTPsn.pm rename to xCAT-server/lib/xcat/plugins/FTPsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/LDAPsn.pm b/xCAT-server/lib/xcat/plugins/LDAPsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/LDAPsn.pm rename to xCAT-server/lib/xcat/plugins/LDAPsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm b/xCAT-server/lib/xcat/plugins/NFSsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm rename to xCAT-server/lib/xcat/plugins/NFSsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/NTPsn.pm b/xCAT-server/lib/xcat/plugins/NTPsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/NTPsn.pm rename to xCAT-server/lib/xcat/plugins/NTPsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/SSHsn.pm b/xCAT-server/lib/xcat/plugins/SSHsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/SSHsn.pm rename to xCAT-server/lib/xcat/plugins/SSHsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm b/xCAT-server/lib/xcat/plugins/TFTPsn.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm rename to xCAT-server/lib/xcat/plugins/TFTPsn.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/aixdskls.pm b/xCAT-server/lib/xcat/plugins/aixdskls.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/aixdskls.pm rename to xCAT-server/lib/xcat/plugins/aixdskls.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/anaconda.pm rename to xCAT-server/lib/xcat/plugins/anaconda.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/bind.pm b/xCAT-server/lib/xcat/plugins/bind.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/bind.pm rename to xCAT-server/lib/xcat/plugins/bind.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/blade.pm rename to xCAT-server/lib/xcat/plugins/blade.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/bmcconfig.pm b/xCAT-server/lib/xcat/plugins/bmcconfig.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/bmcconfig.pm rename to xCAT-server/lib/xcat/plugins/bmcconfig.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/conserver.pm b/xCAT-server/lib/xcat/plugins/conserver.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/conserver.pm rename to xCAT-server/lib/xcat/plugins/conserver.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/copycds.pm b/xCAT-server/lib/xcat/plugins/copycds.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/copycds.pm rename to xCAT-server/lib/xcat/plugins/copycds.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/credentials.pm b/xCAT-server/lib/xcat/plugins/credentials.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/credentials.pm rename to xCAT-server/lib/xcat/plugins/credentials.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/destiny.pm rename to xCAT-server/lib/xcat/plugins/destiny.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/dhcp.pm rename to xCAT-server/lib/xcat/plugins/dhcp.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/fsp.pm b/xCAT-server/lib/xcat/plugins/fsp.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/fsp.pm rename to xCAT-server/lib/xcat/plugins/fsp.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/getpostscript.pm b/xCAT-server/lib/xcat/plugins/getpostscript.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/getpostscript.pm rename to xCAT-server/lib/xcat/plugins/getpostscript.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/hmc.pm b/xCAT-server/lib/xcat/plugins/hmc.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/hmc.pm rename to xCAT-server/lib/xcat/plugins/hmc.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/hosts.pm rename to xCAT-server/lib/xcat/plugins/hosts.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/ipmi.pm rename to xCAT-server/lib/xcat/plugins/ipmi.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/iscsi.pm b/xCAT-server/lib/xcat/plugins/iscsi.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/iscsi.pm rename to xCAT-server/lib/xcat/plugins/iscsi.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/ivm.pm b/xCAT-server/lib/xcat/plugins/ivm.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/ivm.pm rename to xCAT-server/lib/xcat/plugins/ivm.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/lsslp.pm rename to xCAT-server/lib/xcat/plugins/lsslp.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/mknb.pm rename to xCAT-server/lib/xcat/plugins/mknb.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/monctrlcmds.pm b/xCAT-server/lib/xcat/plugins/monctrlcmds.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/monctrlcmds.pm rename to xCAT-server/lib/xcat/plugins/monctrlcmds.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/networks.pm b/xCAT-server/lib/xcat/plugins/networks.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/networks.pm rename to xCAT-server/lib/xcat/plugins/networks.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/nodediscover.pm rename to xCAT-server/lib/xcat/plugins/nodediscover.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/nodestat.pm b/xCAT-server/lib/xcat/plugins/nodestat.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/nodestat.pm rename to xCAT-server/lib/xcat/plugins/nodestat.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/notification.pm b/xCAT-server/lib/xcat/plugins/notification.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/notification.pm rename to xCAT-server/lib/xcat/plugins/notification.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/packimage.pm rename to xCAT-server/lib/xcat/plugins/packimage.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/pxe.pm rename to xCAT-server/lib/xcat/plugins/pxe.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/sles.pm rename to xCAT-server/lib/xcat/plugins/sles.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/switch.pm rename to xCAT-server/lib/xcat/plugins/switch.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/tabutils.pm b/xCAT-server/lib/xcat/plugins/tabutils.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/tabutils.pm rename to xCAT-server/lib/xcat/plugins/tabutils.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/xCATWorld.pm b/xCAT-server/lib/xcat/plugins/xCATWorld.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/xCATWorld.pm rename to xCAT-server/lib/xcat/plugins/xCATWorld.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/xcat2nim.pm b/xCAT-server/lib/xcat/plugins/xcat2nim.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/xcat2nim.pm rename to xCAT-server/lib/xcat/plugins/xcat2nim.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/xdsh.pm b/xCAT-server/lib/xcat/plugins/xdsh.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/xdsh.pm rename to xCAT-server/lib/xcat/plugins/xdsh.pm diff --git a/xCAT-server-2.0/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm similarity index 100% rename from xCAT-server-2.0/lib/xcat/plugins/yaboot.pm rename to xCAT-server/lib/xcat/plugins/yaboot.pm diff --git a/xCAT-server-2.0/lib/xcat/shfunctions b/xCAT-server/lib/xcat/shfunctions similarity index 100% rename from xCAT-server-2.0/lib/xcat/shfunctions rename to xCAT-server/lib/xcat/shfunctions diff --git a/xCAT-server-2.0/sbin/chtab b/xCAT-server/sbin/chtab similarity index 100% rename from xCAT-server-2.0/sbin/chtab rename to xCAT-server/sbin/chtab diff --git a/xCAT-server-2.0/sbin/copycerts b/xCAT-server/sbin/copycerts similarity index 100% rename from xCAT-server-2.0/sbin/copycerts rename to xCAT-server/sbin/copycerts diff --git a/xCAT-server-2.0/sbin/lpar_netboot.expect b/xCAT-server/sbin/lpar_netboot.expect similarity index 100% rename from xCAT-server-2.0/sbin/lpar_netboot.expect rename to xCAT-server/sbin/lpar_netboot.expect diff --git a/xCAT-server-2.0/sbin/makenamed.conf b/xCAT-server/sbin/makenamed.conf similarity index 100% rename from xCAT-server-2.0/sbin/makenamed.conf rename to xCAT-server/sbin/makenamed.conf diff --git a/xCAT-server-2.0/sbin/mknb b/xCAT-server/sbin/mknb similarity index 100% rename from xCAT-server-2.0/sbin/mknb rename to xCAT-server/sbin/mknb diff --git a/xCAT-server-2.0/sbin/remoteshell.expect b/xCAT-server/sbin/remoteshell.expect similarity index 100% rename from xCAT-server-2.0/sbin/remoteshell.expect rename to xCAT-server/sbin/remoteshell.expect diff --git a/xCAT-server-2.0/sbin/updateSNimage b/xCAT-server/sbin/updateSNimage similarity index 100% rename from xCAT-server-2.0/sbin/updateSNimage rename to xCAT-server/sbin/updateSNimage diff --git a/xCAT-server-2.0/sbin/xcat_traphandler b/xCAT-server/sbin/xcat_traphandler similarity index 100% rename from xCAT-server-2.0/sbin/xcat_traphandler rename to xCAT-server/sbin/xcat_traphandler diff --git a/xCAT-server-2.0/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig similarity index 100% rename from xCAT-server-2.0/sbin/xcatconfig rename to xCAT-server/sbin/xcatconfig diff --git a/xCAT-server-2.0/sbin/xcatd b/xCAT-server/sbin/xcatd similarity index 100% rename from xCAT-server-2.0/sbin/xcatd rename to xCAT-server/sbin/xcatd diff --git a/xCAT-server-2.0/sbin/xcatnodemon b/xCAT-server/sbin/xcatnodemon similarity index 100% rename from xCAT-server-2.0/sbin/xcatnodemon rename to xCAT-server/sbin/xcatnodemon diff --git a/xCAT-server-2.0/share/xcat/ca/Makefile b/xCAT-server/share/xcat/ca/Makefile similarity index 100% rename from xCAT-server-2.0/share/xcat/ca/Makefile rename to xCAT-server/share/xcat/ca/Makefile diff --git a/xCAT-server-2.0/share/xcat/ca/openssl.cnf.tmpl b/xCAT-server/share/xcat/ca/openssl.cnf.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/ca/openssl.cnf.tmpl rename to xCAT-server/share/xcat/ca/openssl.cnf.tmpl diff --git a/xCAT-server-2.0/share/xcat/cons/blade b/xCAT-server/share/xcat/cons/blade similarity index 100% rename from xCAT-server-2.0/share/xcat/cons/blade rename to xCAT-server/share/xcat/cons/blade diff --git a/xCAT-server-2.0/share/xcat/cons/blade.expect b/xCAT-server/share/xcat/cons/blade.expect similarity index 100% rename from xCAT-server-2.0/share/xcat/cons/blade.expect rename to xCAT-server/share/xcat/cons/blade.expect diff --git a/xCAT-server-2.0/share/xcat/cons/hmc b/xCAT-server/share/xcat/cons/hmc similarity index 100% rename from xCAT-server-2.0/share/xcat/cons/hmc rename to xCAT-server/share/xcat/cons/hmc diff --git a/xCAT-server-2.0/share/xcat/cons/ipmi b/xCAT-server/share/xcat/cons/ipmi similarity index 100% rename from xCAT-server-2.0/share/xcat/cons/ipmi rename to xCAT-server/share/xcat/cons/ipmi diff --git a/xCAT-server-2.0/share/xcat/install/centos/all.tmpl b/xCAT-server/share/xcat/install/centos/all.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/centos/all.tmpl rename to xCAT-server/share/xcat/install/centos/all.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/centos/compute.tmpl b/xCAT-server/share/xcat/install/centos/compute.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/centos/compute.tmpl rename to xCAT-server/share/xcat/install/centos/compute.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/centos/iscsi.tmpl b/xCAT-server/share/xcat/install/centos/iscsi.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/centos/iscsi.tmpl rename to xCAT-server/share/xcat/install/centos/iscsi.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl rename to xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.tmpl rename to xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/compute.ppc64.tmpl rename to xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.tmpl b/xCAT-server/share/xcat/install/fedora/compute.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/compute.tmpl rename to xCAT-server/share/xcat/install/fedora/compute.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl rename to xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.tmpl rename to xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/iscsi.ppc64.tmpl rename to xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/iscsi.tmpl rename to xCAT-server/share/xcat/install/fedora/iscsi.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.ppc64.tmpl rename to xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.tmpl rename to xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/service.ppc64.tmpl rename to xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl b/xCAT-server/share/xcat/install/fedora/service.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/fedora/service.tmpl rename to xCAT-server/share/xcat/install/fedora/service.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl rename to xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/rh/compute.rhel4.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/rh/compute.rhel4.tmpl rename to xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/rh/compute.tmpl b/xCAT-server/share/xcat/install/rh/compute.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/rh/compute.tmpl rename to xCAT-server/share/xcat/install/rh/compute.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl rename to xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl rename to xCAT-server/share/xcat/install/rh/iscsi.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/rh/service.tmpl b/xCAT-server/share/xcat/install/rh/service.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/rh/service.tmpl rename to xCAT-server/share/xcat/install/rh/service.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/scripts/chroot.sles b/xCAT-server/share/xcat/install/scripts/chroot.sles similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/chroot.sles rename to xCAT-server/share/xcat/install/scripts/chroot.sles diff --git a/xCAT-server-2.0/share/xcat/install/scripts/chroot.sles.iscsi b/xCAT-server/share/xcat/install/scripts/chroot.sles.iscsi similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/chroot.sles.iscsi rename to xCAT-server/share/xcat/install/scripts/chroot.sles.iscsi diff --git a/xCAT-server-2.0/share/xcat/install/scripts/post.rh b/xCAT-server/share/xcat/install/scripts/post.rh similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/post.rh rename to xCAT-server/share/xcat/install/scripts/post.rh diff --git a/xCAT-server-2.0/share/xcat/install/scripts/post.rh.iscsi b/xCAT-server/share/xcat/install/scripts/post.rh.iscsi similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/post.rh.iscsi rename to xCAT-server/share/xcat/install/scripts/post.rh.iscsi diff --git a/xCAT-server-2.0/share/xcat/install/scripts/post.sles b/xCAT-server/share/xcat/install/scripts/post.sles similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/post.sles rename to xCAT-server/share/xcat/install/scripts/post.sles diff --git a/xCAT-server-2.0/share/xcat/install/scripts/post.sles.iscsi b/xCAT-server/share/xcat/install/scripts/post.sles.iscsi similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/post.sles.iscsi rename to xCAT-server/share/xcat/install/scripts/post.sles.iscsi diff --git a/xCAT-server-2.0/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/pre.rh rename to xCAT-server/share/xcat/install/scripts/pre.rh diff --git a/xCAT-server-2.0/share/xcat/install/scripts/pre.sles b/xCAT-server/share/xcat/install/scripts/pre.sles similarity index 100% rename from xCAT-server-2.0/share/xcat/install/scripts/pre.sles rename to xCAT-server/share/xcat/install/scripts/pre.sles diff --git a/xCAT-server-2.0/share/xcat/install/sles/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/sles/compute.ppc64.tmpl rename to xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/sles/compute.tmpl b/xCAT-server/share/xcat/install/sles/compute.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/sles/compute.tmpl rename to xCAT-server/share/xcat/install/sles/compute.tmpl diff --git a/xCAT-server-2.0/share/xcat/install/sles/iscsi.tmpl b/xCAT-server/share/xcat/install/sles/iscsi.tmpl similarity index 100% rename from xCAT-server-2.0/share/xcat/install/sles/iscsi.tmpl rename to xCAT-server/share/xcat/install/sles/iscsi.tmpl diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/stateless/stateless b/xCAT-server/share/xcat/netboot/add-on/stateless/stateless similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/stateless/stateless rename to xCAT-server/share/xcat/netboot/add-on/stateless/stateless diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/add_torque b/xCAT-server/share/xcat/netboot/add-on/torque/add_torque similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/add_torque rename to xCAT-server/share/xcat/netboot/add-on/torque/add_torque diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/moab b/xCAT-server/share/xcat/netboot/add-on/torque/moab similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/moab rename to xCAT-server/share/xcat/netboot/add-on/torque/moab diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/moab.suse b/xCAT-server/share/xcat/netboot/add-on/torque/moab.suse similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/moab.suse rename to xCAT-server/share/xcat/netboot/add-on/torque/moab.suse diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs b/xCAT-server/share/xcat/netboot/add-on/torque/pbs similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs.suse b/xCAT-server/share/xcat/netboot/add-on/torque/pbs.suse similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs.suse rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs.suse diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_mom b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_mom rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_mom.suse b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom.suse similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_mom.suse rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom.suse diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_sched b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_sched rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_sched.suse b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched.suse similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_sched.suse rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched.suse diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_server b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_server similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_server rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs_server diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_server.suse b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_server.suse similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbs_server.suse rename to xCAT-server/share/xcat/netboot/add-on/torque/pbs_server.suse diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbsnodestat b/xCAT-server/share/xcat/netboot/add-on/torque/pbsnodestat similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbsnodestat rename to xCAT-server/share/xcat/netboot/add-on/torque/pbsnodestat diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbstop b/xCAT-server/share/xcat/netboot/add-on/torque/pbstop similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/pbstop rename to xCAT-server/share/xcat/netboot/add-on/torque/pbstop diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/epilogue b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/epilogue similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/epilogue rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/epilogue diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/killuser b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/killuser similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/killuser rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/killuser diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/pbspsh b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/pbspsh similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/pbspsh rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/pbspsh diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/prologue b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/prologue similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/prologue rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/prologue diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/setupnode b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/setupnode similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/setupnode rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/setupnode diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/setupnode2 b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/setupnode2 similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/setupnode2 rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/setupnode2 diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/takedownnode b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/takedownnode similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/takedownnode rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/takedownnode diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/takedownnode2 b/xCAT-server/share/xcat/netboot/add-on/torque/scripts/takedownnode2 similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/scripts/takedownnode2 rename to xCAT-server/share/xcat/netboot/add-on/torque/scripts/takedownnode2 diff --git a/xCAT-server-2.0/share/xcat/netboot/add-on/torque/xpbsnodes b/xCAT-server/share/xcat/netboot/add-on/torque/xpbsnodes similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/add-on/torque/xpbsnodes rename to xCAT-server/share/xcat/netboot/add-on/torque/xpbsnodes diff --git a/xCAT-server-2.0/share/xcat/netboot/aix/xcatAIXpost b/xCAT-server/share/xcat/netboot/aix/xcatAIXpost similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/aix/xcatAIXpost rename to xCAT-server/share/xcat/netboot/aix/xcatAIXpost diff --git a/xCAT-server-2.0/share/xcat/netboot/centos/compute.exlist b/xCAT-server/share/xcat/netboot/centos/compute.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/centos/compute.exlist rename to xCAT-server/share/xcat/netboot/centos/compute.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/centos/compute.pkglist b/xCAT-server/share/xcat/netboot/centos/compute.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/centos/compute.pkglist rename to xCAT-server/share/xcat/netboot/centos/compute.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/centos/genimage b/xCAT-server/share/xcat/netboot/centos/genimage similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/centos/genimage rename to xCAT-server/share/xcat/netboot/centos/genimage diff --git a/xCAT-server-2.0/share/xcat/netboot/centos/geninitrd b/xCAT-server/share/xcat/netboot/centos/geninitrd similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/centos/geninitrd rename to xCAT-server/share/xcat/netboot/centos/geninitrd diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/compute.exlist b/xCAT-server/share/xcat/netboot/fedora/compute.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/compute.exlist rename to xCAT-server/share/xcat/netboot/fedora/compute.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/compute.pkglist b/xCAT-server/share/xcat/netboot/fedora/compute.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/compute.pkglist rename to xCAT-server/share/xcat/netboot/fedora/compute.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/compute.ppc64.pkglist b/xCAT-server/share/xcat/netboot/fedora/compute.ppc64.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/compute.ppc64.pkglist rename to xCAT-server/share/xcat/netboot/fedora/compute.ppc64.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/genimage b/xCAT-server/share/xcat/netboot/fedora/genimage similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/genimage rename to xCAT-server/share/xcat/netboot/fedora/genimage diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/geninitrd b/xCAT-server/share/xcat/netboot/fedora/geninitrd similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/geninitrd rename to xCAT-server/share/xcat/netboot/fedora/geninitrd diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/service.exlist b/xCAT-server/share/xcat/netboot/fedora/service.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/service.exlist rename to xCAT-server/share/xcat/netboot/fedora/service.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/fedora/service.pkglist rename to xCAT-server/share/xcat/netboot/fedora/service.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/compute.exlist b/xCAT-server/share/xcat/netboot/rh/compute.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/rh/compute.exlist rename to xCAT-server/share/xcat/netboot/rh/compute.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/compute.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/rh/compute.pkglist rename to xCAT-server/share/xcat/netboot/rh/compute.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/rh/genimage rename to xCAT-server/share/xcat/netboot/rh/genimage diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/geninitrd b/xCAT-server/share/xcat/netboot/rh/geninitrd similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/rh/geninitrd rename to xCAT-server/share/xcat/netboot/rh/geninitrd diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/service.exlist b/xCAT-server/share/xcat/netboot/rh/service.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/rh/service.exlist rename to xCAT-server/share/xcat/netboot/rh/service.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/rh/service.pkglist b/xCAT-server/share/xcat/netboot/rh/service.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/rh/service.pkglist rename to xCAT-server/share/xcat/netboot/rh/service.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/sles/compute.exlist b/xCAT-server/share/xcat/netboot/sles/compute.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/sles/compute.exlist rename to xCAT-server/share/xcat/netboot/sles/compute.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/sles/compute.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/sles/compute.pkglist rename to xCAT-server/share/xcat/netboot/sles/compute.pkglist diff --git a/xCAT-server-2.0/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/sles/genimage rename to xCAT-server/share/xcat/netboot/sles/genimage diff --git a/xCAT-server-2.0/share/xcat/netboot/sles/geninitrd b/xCAT-server/share/xcat/netboot/sles/geninitrd similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/sles/geninitrd rename to xCAT-server/share/xcat/netboot/sles/geninitrd diff --git a/xCAT-server-2.0/share/xcat/netboot/sles/service.exlist b/xCAT-server/share/xcat/netboot/sles/service.exlist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/sles/service.exlist rename to xCAT-server/share/xcat/netboot/sles/service.exlist diff --git a/xCAT-server-2.0/share/xcat/netboot/sles/service.pkglist b/xCAT-server/share/xcat/netboot/sles/service.pkglist similarity index 100% rename from xCAT-server-2.0/share/xcat/netboot/sles/service.pkglist rename to xCAT-server/share/xcat/netboot/sles/service.pkglist diff --git a/xCAT-server-2.0/share/xcat/postscripts/enablesysreq b/xCAT-server/share/xcat/postscripts/enablesysreq similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/enablesysreq rename to xCAT-server/share/xcat/postscripts/enablesysreq diff --git a/xCAT-server-2.0/share/xcat/postscripts/hardeths b/xCAT-server/share/xcat/postscripts/hardeths similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/hardeths rename to xCAT-server/share/xcat/postscripts/hardeths diff --git a/xCAT-server-2.0/share/xcat/postscripts/reboot b/xCAT-server/share/xcat/postscripts/reboot similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/reboot rename to xCAT-server/share/xcat/postscripts/reboot diff --git a/xCAT-server-2.0/share/xcat/postscripts/remoteshell b/xCAT-server/share/xcat/postscripts/remoteshell similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/remoteshell rename to xCAT-server/share/xcat/postscripts/remoteshell diff --git a/xCAT-server-2.0/share/xcat/postscripts/resyslog b/xCAT-server/share/xcat/postscripts/resyslog similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/resyslog rename to xCAT-server/share/xcat/postscripts/resyslog diff --git a/xCAT-server-2.0/share/xcat/postscripts/serialconsole b/xCAT-server/share/xcat/postscripts/serialconsole similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/serialconsole rename to xCAT-server/share/xcat/postscripts/serialconsole diff --git a/xCAT-server-2.0/share/xcat/postscripts/syslog b/xCAT-server/share/xcat/postscripts/syslog similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/syslog rename to xCAT-server/share/xcat/postscripts/syslog diff --git a/xCAT-server-2.0/share/xcat/postscripts/updateflag.awk b/xCAT-server/share/xcat/postscripts/updateflag.awk similarity index 100% rename from xCAT-server-2.0/share/xcat/postscripts/updateflag.awk rename to xCAT-server/share/xcat/postscripts/updateflag.awk diff --git a/xCAT-server-2.0/share/xcat/scripts/bitscount.pl b/xCAT-server/share/xcat/scripts/bitscount.pl similarity index 100% rename from xCAT-server-2.0/share/xcat/scripts/bitscount.pl rename to xCAT-server/share/xcat/scripts/bitscount.pl diff --git a/xCAT-server-2.0/share/xcat/scripts/countbits.pl b/xCAT-server/share/xcat/scripts/countbits.pl similarity index 100% rename from xCAT-server-2.0/share/xcat/scripts/countbits.pl rename to xCAT-server/share/xcat/scripts/countbits.pl diff --git a/xCAT-server-2.0/share/xcat/scripts/ipcalc.ksh b/xCAT-server/share/xcat/scripts/ipcalc.ksh similarity index 100% rename from xCAT-server-2.0/share/xcat/scripts/ipcalc.ksh rename to xCAT-server/share/xcat/scripts/ipcalc.ksh diff --git a/xCAT-server-2.0/share/xcat/scripts/setup-local-client.sh b/xCAT-server/share/xcat/scripts/setup-local-client.sh similarity index 100% rename from xCAT-server-2.0/share/xcat/scripts/setup-local-client.sh rename to xCAT-server/share/xcat/scripts/setup-local-client.sh diff --git a/xCAT-server-2.0/share/xcat/scripts/setup-server-cert.sh b/xCAT-server/share/xcat/scripts/setup-server-cert.sh similarity index 100% rename from xCAT-server-2.0/share/xcat/scripts/setup-server-cert.sh rename to xCAT-server/share/xcat/scripts/setup-server-cert.sh diff --git a/xCAT-server-2.0/share/xcat/scripts/setup-xcat-ca.sh b/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh similarity index 100% rename from xCAT-server-2.0/share/xcat/scripts/setup-xcat-ca.sh rename to xCAT-server/share/xcat/scripts/setup-xcat-ca.sh diff --git a/xCAT-server-2.0/share/xcat/tools/cleanxCATaix b/xCAT-server/share/xcat/tools/cleanxCATaix similarity index 100% rename from xCAT-server-2.0/share/xcat/tools/cleanxCATaix rename to xCAT-server/share/xcat/tools/cleanxCATaix diff --git a/xCAT-server-2.0/share/xcat/tools/csm2xcatdefs b/xCAT-server/share/xcat/tools/csm2xcatdefs similarity index 100% rename from xCAT-server-2.0/share/xcat/tools/csm2xcatdefs rename to xCAT-server/share/xcat/tools/csm2xcatdefs diff --git a/xCAT-server-2.0/share/xcat/tools/mkrrbc b/xCAT-server/share/xcat/tools/mkrrbc similarity index 100% rename from xCAT-server-2.0/share/xcat/tools/mkrrbc rename to xCAT-server/share/xcat/tools/mkrrbc diff --git a/xCAT-server-2.0/share/xcat/tools/mkrrnodes b/xCAT-server/share/xcat/tools/mkrrnodes similarity index 100% rename from xCAT-server-2.0/share/xcat/tools/mkrrnodes rename to xCAT-server/share/xcat/tools/mkrrnodes diff --git a/xCAT-server-2.0/xCAT-server.spec b/xCAT-server/xCAT-server.spec similarity index 100% rename from xCAT-server-2.0/xCAT-server.spec rename to xCAT-server/xCAT-server.spec diff --git a/xCAT-server-2.0/xcatd.rc b/xCAT-server/xcatd.rc similarity index 100% rename from xCAT-server-2.0/xcatd.rc rename to xCAT-server/xcatd.rc