diff --git a/xCAT-server-2.0/usr/lib/xcat/dsh/Context/XCAT.pm b/xCAT-server-2.0/lib/xcat/dsh/Context/XCAT.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/dsh/Context/XCAT.pm
rename to xCAT-server-2.0/lib/xcat/dsh/Context/XCAT.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/monitoring/monitorctrl.pm b/xCAT-server-2.0/lib/xcat/monitoring/monitorctrl.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/monitoring/monitorctrl.pm
rename to xCAT-server-2.0/lib/xcat/monitoring/monitorctrl.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/monitoring/samples/mycode.pm b/xCAT-server-2.0/lib/xcat/monitoring/samples/mycode.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/monitoring/samples/mycode.pm
rename to xCAT-server-2.0/lib/xcat/monitoring/samples/mycode.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/monitoring/samples/templatemon.pm b/xCAT-server-2.0/lib/xcat/monitoring/samples/templatemon.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/monitoring/samples/templatemon.pm
rename to xCAT-server-2.0/lib/xcat/monitoring/samples/templatemon.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/monitoring/xcatmon.pm b/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/monitoring/xcatmon.pm
rename to xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server-2.0/lib/xcat/plugins/DBobjectdefs.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/DBobjectdefs.pm
rename to xCAT-server-2.0/lib/xcat/plugins/DBobjectdefs.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/bind.pm b/xCAT-server-2.0/lib/xcat/plugins/bind.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/bind.pm
rename to xCAT-server-2.0/lib/xcat/plugins/bind.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/blade.pm b/xCAT-server-2.0/lib/xcat/plugins/blade.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/blade.pm
rename to xCAT-server-2.0/lib/xcat/plugins/blade.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/bmcconfig.pm b/xCAT-server-2.0/lib/xcat/plugins/bmcconfig.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/bmcconfig.pm
rename to xCAT-server-2.0/lib/xcat/plugins/bmcconfig.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/centos.pm b/xCAT-server-2.0/lib/xcat/plugins/centos.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/centos.pm
rename to xCAT-server-2.0/lib/xcat/plugins/centos.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/conserver.pm b/xCAT-server-2.0/lib/xcat/plugins/conserver.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/conserver.pm
rename to xCAT-server-2.0/lib/xcat/plugins/conserver.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/copycds.pm b/xCAT-server-2.0/lib/xcat/plugins/copycds.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/copycds.pm
rename to xCAT-server-2.0/lib/xcat/plugins/copycds.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/destiny.pm b/xCAT-server-2.0/lib/xcat/plugins/destiny.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/destiny.pm
rename to xCAT-server-2.0/lib/xcat/plugins/destiny.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/dhcp.pm b/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/dhcp.pm
rename to xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/fsp.pm b/xCAT-server-2.0/lib/xcat/plugins/fsp.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/fsp.pm
rename to xCAT-server-2.0/lib/xcat/plugins/fsp.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/hmc.pm b/xCAT-server-2.0/lib/xcat/plugins/hmc.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/hmc.pm
rename to xCAT-server-2.0/lib/xcat/plugins/hmc.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/hosts.pm b/xCAT-server-2.0/lib/xcat/plugins/hosts.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/hosts.pm
rename to xCAT-server-2.0/lib/xcat/plugins/hosts.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/ipmi.pm b/xCAT-server-2.0/lib/xcat/plugins/ipmi.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/ipmi.pm
rename to xCAT-server-2.0/lib/xcat/plugins/ipmi.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/ivm.pm b/xCAT-server-2.0/lib/xcat/plugins/ivm.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/ivm.pm
rename to xCAT-server-2.0/lib/xcat/plugins/ivm.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/monctrlcmds.pm b/xCAT-server-2.0/lib/xcat/plugins/monctrlcmds.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/monctrlcmds.pm
rename to xCAT-server-2.0/lib/xcat/plugins/monctrlcmds.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/networks.pm b/xCAT-server-2.0/lib/xcat/plugins/networks.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/networks.pm
rename to xCAT-server-2.0/lib/xcat/plugins/networks.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/nodediscover.pm b/xCAT-server-2.0/lib/xcat/plugins/nodediscover.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/nodediscover.pm
rename to xCAT-server-2.0/lib/xcat/plugins/nodediscover.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/notification.pm b/xCAT-server-2.0/lib/xcat/plugins/notification.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/notification.pm
rename to xCAT-server-2.0/lib/xcat/plugins/notification.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/pxe.pm b/xCAT-server-2.0/lib/xcat/plugins/pxe.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/pxe.pm
rename to xCAT-server-2.0/lib/xcat/plugins/pxe.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/rhel.pm b/xCAT-server-2.0/lib/xcat/plugins/rhel.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/rhel.pm
rename to xCAT-server-2.0/lib/xcat/plugins/rhel.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/sles.pm b/xCAT-server-2.0/lib/xcat/plugins/sles.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/sles.pm
rename to xCAT-server-2.0/lib/xcat/plugins/sles.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/switch.pm b/xCAT-server-2.0/lib/xcat/plugins/switch.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/switch.pm
rename to xCAT-server-2.0/lib/xcat/plugins/switch.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/tabutils.pm b/xCAT-server-2.0/lib/xcat/plugins/tabutils.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/tabutils.pm
rename to xCAT-server-2.0/lib/xcat/plugins/tabutils.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/xdsh.pm b/xCAT-server-2.0/lib/xcat/plugins/xdsh.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/xdsh.pm
rename to xCAT-server-2.0/lib/xcat/plugins/xdsh.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/plugins/yaboot.pm b/xCAT-server-2.0/lib/xcat/plugins/yaboot.pm
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/plugins/yaboot.pm
rename to xCAT-server-2.0/lib/xcat/plugins/yaboot.pm
diff --git a/xCAT-server-2.0/usr/lib/xcat/shfunctions b/xCAT-server-2.0/lib/xcat/shfunctions
similarity index 100%
rename from xCAT-server-2.0/usr/lib/xcat/shfunctions
rename to xCAT-server-2.0/lib/xcat/shfunctions
diff --git a/xCAT-server-2.0/usr/sbin/chtab b/xCAT-server-2.0/sbin/chtab
similarity index 100%
rename from xCAT-server-2.0/usr/sbin/chtab
rename to xCAT-server-2.0/sbin/chtab
diff --git a/xCAT-server-2.0/usr/sbin/mknb b/xCAT-server-2.0/sbin/mknb
similarity index 100%
rename from xCAT-server-2.0/usr/sbin/mknb
rename to xCAT-server-2.0/sbin/mknb
diff --git a/xCAT-server-2.0/usr/sbin/xcatd b/xCAT-server-2.0/sbin/xcatd
similarity index 100%
rename from xCAT-server-2.0/usr/sbin/xcatd
rename to xCAT-server-2.0/sbin/xcatd
diff --git a/xCAT-server-2.0/usr/sbin/xcatnodemon b/xCAT-server-2.0/sbin/xcatnodemon
similarity index 100%
rename from xCAT-server-2.0/usr/sbin/xcatnodemon
rename to xCAT-server-2.0/sbin/xcatnodemon
diff --git a/xCAT-server-2.0/usr/share/xcat/ca/Makefile b/xCAT-server-2.0/share/xcat/ca/Makefile
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/ca/Makefile
rename to xCAT-server-2.0/share/xcat/ca/Makefile
diff --git a/xCAT-server-2.0/usr/share/xcat/ca/openssl.cnf.tmpl b/xCAT-server-2.0/share/xcat/ca/openssl.cnf.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/ca/openssl.cnf.tmpl
rename to xCAT-server-2.0/share/xcat/ca/openssl.cnf.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/cons/blade b/xCAT-server-2.0/share/xcat/cons/blade
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/cons/blade
rename to xCAT-server-2.0/share/xcat/cons/blade
diff --git a/xCAT-server-2.0/usr/share/xcat/cons/blade.expect b/xCAT-server-2.0/share/xcat/cons/blade.expect
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/cons/blade.expect
rename to xCAT-server-2.0/share/xcat/cons/blade.expect
diff --git a/xCAT-server-2.0/usr/share/xcat/cons/hmc b/xCAT-server-2.0/share/xcat/cons/hmc
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/cons/hmc
rename to xCAT-server-2.0/share/xcat/cons/hmc
diff --git a/xCAT-server-2.0/usr/share/xcat/cons/ipmi b/xCAT-server-2.0/share/xcat/cons/ipmi
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/cons/ipmi
rename to xCAT-server-2.0/share/xcat/cons/ipmi
diff --git a/xCAT-server-2.0/usr/share/xcat/install/centos/all.tmpl b/xCAT-server-2.0/share/xcat/install/centos/all.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/centos/all.tmpl
rename to xCAT-server-2.0/share/xcat/install/centos/all.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/centos/compute.tmpl b/xCAT-server-2.0/share/xcat/install/centos/compute.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/centos/compute.tmpl
rename to xCAT-server-2.0/share/xcat/install/centos/compute.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/rh/compute.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/rh/compute.ppc64.tmpl
rename to xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/rh/compute.tmpl b/xCAT-server-2.0/share/xcat/install/rh/compute.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/rh/compute.tmpl
rename to xCAT-server-2.0/share/xcat/install/rh/compute.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/rh/iscsi.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/rh/iscsi.ppc64.tmpl
rename to xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/rh/iscsi.tmpl b/xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/rh/iscsi.tmpl
rename to xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/scripts/chroot.sles b/xCAT-server-2.0/share/xcat/install/scripts/chroot.sles
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/scripts/chroot.sles
rename to xCAT-server-2.0/share/xcat/install/scripts/chroot.sles
diff --git a/xCAT-server-2.0/usr/share/xcat/install/scripts/post.rh b/xCAT-server-2.0/share/xcat/install/scripts/post.rh
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/scripts/post.rh
rename to xCAT-server-2.0/share/xcat/install/scripts/post.rh
diff --git a/xCAT-server-2.0/usr/share/xcat/install/scripts/post.sles b/xCAT-server-2.0/share/xcat/install/scripts/post.sles
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/scripts/post.sles
rename to xCAT-server-2.0/share/xcat/install/scripts/post.sles
diff --git a/xCAT-server-2.0/usr/share/xcat/install/scripts/pre.rh b/xCAT-server-2.0/share/xcat/install/scripts/pre.rh
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/scripts/pre.rh
rename to xCAT-server-2.0/share/xcat/install/scripts/pre.rh
diff --git a/xCAT-server-2.0/usr/share/xcat/install/scripts/pre.sles b/xCAT-server-2.0/share/xcat/install/scripts/pre.sles
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/scripts/pre.sles
rename to xCAT-server-2.0/share/xcat/install/scripts/pre.sles
diff --git a/xCAT-server-2.0/usr/share/xcat/install/sles/compute.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/sles/compute.ppc64.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/sles/compute.ppc64.tmpl
rename to xCAT-server-2.0/share/xcat/install/sles/compute.ppc64.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/install/sles/compute.tmpl b/xCAT-server-2.0/share/xcat/install/sles/compute.tmpl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/install/sles/compute.tmpl
rename to xCAT-server-2.0/share/xcat/install/sles/compute.tmpl
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/enablesysreq b/xCAT-server-2.0/share/xcat/postscripts/enablesysreq
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/enablesysreq
rename to xCAT-server-2.0/share/xcat/postscripts/enablesysreq
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/reboot b/xCAT-server-2.0/share/xcat/postscripts/reboot
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/reboot
rename to xCAT-server-2.0/share/xcat/postscripts/reboot
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/remoteshell b/xCAT-server-2.0/share/xcat/postscripts/remoteshell
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/remoteshell
rename to xCAT-server-2.0/share/xcat/postscripts/remoteshell
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/resyslog b/xCAT-server-2.0/share/xcat/postscripts/resyslog
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/resyslog
rename to xCAT-server-2.0/share/xcat/postscripts/resyslog
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/serialconsole b/xCAT-server-2.0/share/xcat/postscripts/serialconsole
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/serialconsole
rename to xCAT-server-2.0/share/xcat/postscripts/serialconsole
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/syslog b/xCAT-server-2.0/share/xcat/postscripts/syslog
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/syslog
rename to xCAT-server-2.0/share/xcat/postscripts/syslog
diff --git a/xCAT-server-2.0/usr/share/xcat/postscripts/updateflag.awk b/xCAT-server-2.0/share/xcat/postscripts/updateflag.awk
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/postscripts/updateflag.awk
rename to xCAT-server-2.0/share/xcat/postscripts/updateflag.awk
diff --git a/xCAT-server-2.0/usr/share/xcat/scripts/bitscount.pl b/xCAT-server-2.0/share/xcat/scripts/bitscount.pl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/scripts/bitscount.pl
rename to xCAT-server-2.0/share/xcat/scripts/bitscount.pl
diff --git a/xCAT-server-2.0/usr/share/xcat/scripts/countbits.pl b/xCAT-server-2.0/share/xcat/scripts/countbits.pl
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/scripts/countbits.pl
rename to xCAT-server-2.0/share/xcat/scripts/countbits.pl
diff --git a/xCAT-server-2.0/usr/share/xcat/scripts/ipcalc.ksh b/xCAT-server-2.0/share/xcat/scripts/ipcalc.ksh
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/scripts/ipcalc.ksh
rename to xCAT-server-2.0/share/xcat/scripts/ipcalc.ksh
diff --git a/xCAT-server-2.0/usr/share/xcat/scripts/setup-local-client.sh b/xCAT-server-2.0/share/xcat/scripts/setup-local-client.sh
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/scripts/setup-local-client.sh
rename to xCAT-server-2.0/share/xcat/scripts/setup-local-client.sh
diff --git a/xCAT-server-2.0/usr/share/xcat/scripts/setup-server-cert.sh b/xCAT-server-2.0/share/xcat/scripts/setup-server-cert.sh
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/scripts/setup-server-cert.sh
rename to xCAT-server-2.0/share/xcat/scripts/setup-server-cert.sh
diff --git a/xCAT-server-2.0/usr/share/xcat/scripts/setup-xcat-ca.sh b/xCAT-server-2.0/share/xcat/scripts/setup-xcat-ca.sh
similarity index 100%
rename from xCAT-server-2.0/usr/share/xcat/scripts/setup-xcat-ca.sh
rename to xCAT-server-2.0/share/xcat/scripts/setup-xcat-ca.sh