diff --git a/tools/shell/Makefile.am b/shell/Makefile.am
similarity index 100%
rename from tools/shell/Makefile.am
rename to shell/Makefile.am
diff --git a/tools/shell/regression/001.exp.xml b/shell/regression/001.exp.xml
similarity index 100%
rename from tools/shell/regression/001.exp.xml
rename to shell/regression/001.exp.xml
diff --git a/tools/shell/regression/001.input b/shell/regression/001.input
similarity index 100%
rename from tools/shell/regression/001.input
rename to shell/regression/001.input
diff --git a/tools/shell/regression/002.exp.xml b/shell/regression/002.exp.xml
similarity index 100%
rename from tools/shell/regression/002.exp.xml
rename to shell/regression/002.exp.xml
diff --git a/tools/shell/regression/002.input b/shell/regression/002.input
similarity index 100%
rename from tools/shell/regression/002.input
rename to shell/regression/002.input
diff --git a/tools/shell/regression/003.exp.xml b/shell/regression/003.exp.xml
similarity index 100%
rename from tools/shell/regression/003.exp.xml
rename to shell/regression/003.exp.xml
diff --git a/tools/shell/regression/003.input b/shell/regression/003.input
similarity index 100%
rename from tools/shell/regression/003.input
rename to shell/regression/003.input
diff --git a/tools/shell/regression/004.exp.xml b/shell/regression/004.exp.xml
similarity index 100%
rename from tools/shell/regression/004.exp.xml
rename to shell/regression/004.exp.xml
diff --git a/tools/shell/regression/004.input b/shell/regression/004.input
similarity index 100%
rename from tools/shell/regression/004.input
rename to shell/regression/004.input
diff --git a/tools/shell/regression/Makefile.am b/shell/regression/Makefile.am
similarity index 100%
rename from tools/shell/regression/Makefile.am
rename to shell/regression/Makefile.am
diff --git a/tools/shell/regression/README.regression b/shell/regression/README.regression
similarity index 100%
rename from tools/shell/regression/README.regression
rename to shell/regression/README.regression
diff --git a/tools/shell/regression/crm-interface b/shell/regression/crm-interface
similarity index 100%
rename from tools/shell/regression/crm-interface
rename to shell/regression/crm-interface
diff --git a/tools/shell/regression/crm_regression.sh b/shell/regression/crm_regression.sh
similarity index 100%
rename from tools/shell/regression/crm_regression.sh
rename to shell/regression/crm_regression.sh
diff --git a/tools/shell/regression/defaults b/shell/regression/defaults
similarity index 100%
rename from tools/shell/regression/defaults
rename to shell/regression/defaults
diff --git a/tools/shell/regression/descriptions b/shell/regression/descriptions
similarity index 100%
rename from tools/shell/regression/descriptions
rename to shell/regression/descriptions
diff --git a/tools/shell/regression/empty.xml b/shell/regression/empty.xml
similarity index 100%
rename from tools/shell/regression/empty.xml
rename to shell/regression/empty.xml
diff --git a/tools/shell/regression/evaltest.sh b/shell/regression/evaltest.sh
similarity index 100%
rename from tools/shell/regression/evaltest.sh
rename to shell/regression/evaltest.sh
diff --git a/tools/shell/regression/lrmregtest-lsb.in b/shell/regression/lrmregtest-lsb.in
similarity index 100%
rename from tools/shell/regression/lrmregtest-lsb.in
rename to shell/regression/lrmregtest-lsb.in
diff --git a/tools/shell/regression/regression.sh.in b/shell/regression/regression.sh.in
similarity index 100%
rename from tools/shell/regression/regression.sh.in
rename to shell/regression/regression.sh.in
diff --git a/tools/shell/regression/shadow.base b/shell/regression/shadow.base
similarity index 100%
rename from tools/shell/regression/shadow.base
rename to shell/regression/shadow.base
diff --git a/tools/shell/regression/testcases/BSC b/shell/regression/testcases/BSC
similarity index 100%
rename from tools/shell/regression/testcases/BSC
rename to shell/regression/testcases/BSC
diff --git a/tools/shell/regression/testcases/Makefile.am b/shell/regression/testcases/Makefile.am
similarity index 100%
rename from tools/shell/regression/testcases/Makefile.am
rename to shell/regression/testcases/Makefile.am
diff --git a/tools/shell/regression/testcases/basicset b/shell/regression/testcases/basicset
similarity index 100%
rename from tools/shell/regression/testcases/basicset
rename to shell/regression/testcases/basicset
diff --git a/tools/shell/regression/testcases/common.excl b/shell/regression/testcases/common.excl
similarity index 100%
rename from tools/shell/regression/testcases/common.excl
rename to shell/regression/testcases/common.excl
diff --git a/tools/shell/regression/testcases/confbasic b/shell/regression/testcases/confbasic
similarity index 100%
rename from tools/shell/regression/testcases/confbasic
rename to shell/regression/testcases/confbasic
diff --git a/tools/shell/regression/testcases/confbasic-xml b/shell/regression/testcases/confbasic-xml
similarity index 100%
rename from tools/shell/regression/testcases/confbasic-xml
rename to shell/regression/testcases/confbasic-xml
diff --git a/tools/shell/regression/testcases/confbasic-xml.exp b/shell/regression/testcases/confbasic-xml.exp
similarity index 100%
rename from tools/shell/regression/testcases/confbasic-xml.exp
rename to shell/regression/testcases/confbasic-xml.exp
diff --git a/tools/shell/regression/testcases/confbasic.exp b/shell/regression/testcases/confbasic.exp
similarity index 100%
rename from tools/shell/regression/testcases/confbasic.exp
rename to shell/regression/testcases/confbasic.exp
diff --git a/tools/shell/regression/testcases/delete b/shell/regression/testcases/delete
similarity index 100%
rename from tools/shell/regression/testcases/delete
rename to shell/regression/testcases/delete
diff --git a/tools/shell/regression/testcases/delete.exp b/shell/regression/testcases/delete.exp
similarity index 100%
rename from tools/shell/regression/testcases/delete.exp
rename to shell/regression/testcases/delete.exp
diff --git a/tools/shell/regression/testcases/file b/shell/regression/testcases/file
similarity index 100%
rename from tools/shell/regression/testcases/file
rename to shell/regression/testcases/file
diff --git a/tools/shell/regression/testcases/file.exp b/shell/regression/testcases/file.exp
similarity index 100%
rename from tools/shell/regression/testcases/file.exp
rename to shell/regression/testcases/file.exp
diff --git a/tools/shell/regression/testcases/node b/shell/regression/testcases/node
similarity index 100%
rename from tools/shell/regression/testcases/node
rename to shell/regression/testcases/node
diff --git a/tools/shell/regression/testcases/node.exp b/shell/regression/testcases/node.exp
similarity index 100%
rename from tools/shell/regression/testcases/node.exp
rename to shell/regression/testcases/node.exp
diff --git a/tools/shell/regression/testcases/ra b/shell/regression/testcases/ra
similarity index 100%
rename from tools/shell/regression/testcases/ra
rename to shell/regression/testcases/ra
diff --git a/tools/shell/regression/testcases/ra.exp b/shell/regression/testcases/ra.exp
similarity index 100%
rename from tools/shell/regression/testcases/ra.exp
rename to shell/regression/testcases/ra.exp
diff --git a/tools/shell/regression/testcases/resource b/shell/regression/testcases/resource
similarity index 100%
rename from tools/shell/regression/testcases/resource
rename to shell/regression/testcases/resource
diff --git a/tools/shell/regression/testcases/resource.exp b/shell/regression/testcases/resource.exp
similarity index 100%
rename from tools/shell/regression/testcases/resource.exp
rename to shell/regression/testcases/resource.exp
diff --git a/tools/shell/regression/testcases/shadow b/shell/regression/testcases/shadow
similarity index 100%
rename from tools/shell/regression/testcases/shadow
rename to shell/regression/testcases/shadow
diff --git a/tools/shell/regression/testcases/shadow.exp b/shell/regression/testcases/shadow.exp
similarity index 100%
rename from tools/shell/regression/testcases/shadow.exp
rename to shell/regression/testcases/shadow.exp
diff --git a/tools/shell/regression/testcases/xmlonly.sh b/shell/regression/testcases/xmlonly.sh
similarity index 100%
rename from tools/shell/regression/testcases/xmlonly.sh
rename to shell/regression/testcases/xmlonly.sh
diff --git a/tools/shell/templates/Makefile.am b/shell/templates/Makefile.am
similarity index 100%
rename from tools/shell/templates/Makefile.am
rename to shell/templates/Makefile.am
diff --git a/tools/shell/templates/apache b/shell/templates/apache
similarity index 100%
rename from tools/shell/templates/apache
rename to shell/templates/apache
diff --git a/tools/shell/templates/clvm b/shell/templates/clvm
similarity index 100%
rename from tools/shell/templates/clvm
rename to shell/templates/clvm
diff --git a/tools/shell/templates/filesystem b/shell/templates/filesystem
similarity index 100%
rename from tools/shell/templates/filesystem
rename to shell/templates/filesystem
diff --git a/tools/shell/templates/gfs2 b/shell/templates/gfs2
similarity index 100%
rename from tools/shell/templates/gfs2
rename to shell/templates/gfs2
diff --git a/tools/shell/templates/gfs2-base b/shell/templates/gfs2-base
similarity index 100%
rename from tools/shell/templates/gfs2-base
rename to shell/templates/gfs2-base
diff --git a/tools/shell/templates/ocfs2 b/shell/templates/ocfs2
similarity index 100%
rename from tools/shell/templates/ocfs2
rename to shell/templates/ocfs2
diff --git a/tools/shell/templates/virtual-ip b/shell/templates/virtual-ip
similarity index 100%
rename from tools/shell/templates/virtual-ip
rename to shell/templates/virtual-ip