diff --git a/tools/crm_regression/001.exp.xml b/tools/shell/regression/001.exp.xml
similarity index 100%
rename from tools/crm_regression/001.exp.xml
rename to tools/shell/regression/001.exp.xml
diff --git a/tools/crm_regression/001.input b/tools/shell/regression/001.input
similarity index 100%
rename from tools/crm_regression/001.input
rename to tools/shell/regression/001.input
diff --git a/tools/crm_regression/002.exp.xml b/tools/shell/regression/002.exp.xml
similarity index 100%
rename from tools/crm_regression/002.exp.xml
rename to tools/shell/regression/002.exp.xml
diff --git a/tools/crm_regression/002.input b/tools/shell/regression/002.input
similarity index 100%
rename from tools/crm_regression/002.input
rename to tools/shell/regression/002.input
diff --git a/tools/crm_regression/003.exp.xml b/tools/shell/regression/003.exp.xml
similarity index 100%
rename from tools/crm_regression/003.exp.xml
rename to tools/shell/regression/003.exp.xml
diff --git a/tools/crm_regression/003.input b/tools/shell/regression/003.input
similarity index 100%
rename from tools/crm_regression/003.input
rename to tools/shell/regression/003.input
diff --git a/tools/crm_regression/004.exp.xml b/tools/shell/regression/004.exp.xml
similarity index 100%
rename from tools/crm_regression/004.exp.xml
rename to tools/shell/regression/004.exp.xml
diff --git a/tools/crm_regression/004.input b/tools/shell/regression/004.input
similarity index 100%
rename from tools/crm_regression/004.input
rename to tools/shell/regression/004.input
diff --git a/tools/crm_regression/crm_regression.sh b/tools/shell/regression/crm_regression.sh
similarity index 100%
rename from tools/crm_regression/crm_regression.sh
rename to tools/shell/regression/crm_regression.sh
diff --git a/tools/crm_regression/shadow.base b/tools/shell/regression/shadow.base
similarity index 100%
rename from tools/crm_regression/shadow.base
rename to tools/shell/regression/shadow.base