diff --git a/ps-config/basicFunctionalities/basicFunctionalities.conf b/ps-config/basicFunctionalities/basicFunctionalities.conf
index 153cff4e4252102d6b33bbccfa00ed38df2b8c7a..74ea963041d74cd98c5cc634df0a0eb26ee52218 100644
--- a/ps-config/basicFunctionalities/basicFunctionalities.conf
+++ b/ps-config/basicFunctionalities/basicFunctionalities.conf
@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=basicFunctionalities;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/basicFunctionalities/basicFunctionalities.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/basicFunctionalities/basicFunctionalities.jsgf;
rsbscope=/speechrec/psa/basicFunctionalities;
bestpath=no;
autoload=yes;
diff --git a/ps-config/basicFunctionalities/basicFunctionalities.conf~ b/ps-config/basicFunctionalities/basicFunctionalities.conf~
deleted file mode 100644
index 2340f14d7bb2e0c581e9b64c57d750eb147ee021..0000000000000000000000000000000000000000
--- a/ps-config/basicFunctionalities/basicFunctionalities.conf~
+++ /dev/null
@@ -1,15 +0,0 @@
-[main]
-startdb=30;
-uttdb=35;
-silence=400;
-timeout=8;
-openDeviceDirectly=yes;
-
-[pocketsphinxinstance]
-name=basicFunctionalities;
-hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/basicFunctionalities/basicFunctionalities.jsgf;
-rsbscope=/speechrec/psa/basicFunctionalities;
-bestpath=no;
-autoload=yes;
diff --git a/ps-config/cleanUp/cleanUp.conf b/ps-config/cleanUp/cleanUp.conf
index df598dce78fa1095283b6e06b029332158ed12a5..738ecf8a767a596ad5aa718c3cf3ee8780fa2c86 100644
--- a/ps-config/cleanUp/cleanUp.conf
+++ b/ps-config/cleanUp/cleanUp.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=cleanUp;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/cleanUp/cleanUp.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/cleanUp/cleanUp.jsgf;
rsbscope=/speechrec/psa/cleanUp;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/cocktailparty/cocktailparty.conf b/ps-config/cocktailparty/cocktailparty.conf
index 490fa9bfde7de445e9823863cef7551d608de948..b003e552d846c31a95f2749578bc5e2f699ae036 100644
--- a/ps-config/cocktailparty/cocktailparty.conf
+++ b/ps-config/cocktailparty/cocktailparty.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=person;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/person/person.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/person/person.jsgf;
rsbscope=/speechrec/psa/person;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=object;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/cocktailparty/object.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/cocktailparty/object.jsgf;
rsbscope=/speechrec/psa/object;
bestpath=no;
autoload=yes;
@@ -25,8 +25,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/demo/demoCentralLab.conf b/ps-config/demo/demoCentralLab.conf
index 2e56fdd5cd1e9126645a0aa3abbfa1497d8b4389..e7cf7402ee78524f04bb2866be1b7ed848ff0818 100644
--- a/ps-config/demo/demoCentralLab.conf
+++ b/ps-config/demo/demoCentralLab.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=shellgame;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/shellgame/shellgame.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/shellgame/shellgame.jsgf;
rsbscope=/speechrec/psa/shellgame;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
@@ -25,8 +25,8 @@ autoload=yes;
[pocketsphinxinstance]
name=commands;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/commands/commands.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/commands/commands.jsgf;
rsbscope=/speechrec/psa/commands;
bestpath=no;
autoload=yes;
@@ -34,8 +34,8 @@ autoload=yes;
[pocketsphinxinstance]
name=sfbreview;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/sfb/review.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/sfb/review.jsgf;
rsbscope=/speechrec/psa/sfbreview;
bestpath=no;
autoload=yes;
diff --git a/ps-config/demoChallange/demoChallange.conf b/ps-config/demoChallange/demoChallange.conf
index c080edff1c6344a0ce45029e3a0b3226491eaf2c..a28449f61bfd9182bca586e0401126fa18da0ebb 100644
--- a/ps-config/demoChallange/demoChallange.conf
+++ b/ps-config/demoChallange/demoChallange.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=demoChallange;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/demoChallange/demoChallange.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/demoChallange/demoChallange.jsgf;
rsbscope=/speechrec/psa/demoChallange;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/demoChallenge/demoChallenge.conf b/ps-config/demoChallenge/demoChallenge.conf
index 03bc15f4dc4b656bee81a1484231980be301638c..d2a829c0592f249c4396428e37837e09eba29cb0 100644
--- a/ps-config/demoChallenge/demoChallenge.conf
+++ b/ps-config/demoChallenge/demoChallenge.conf
@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
@@ -17,8 +17,8 @@ autoload=yes;
[pocketsphinxinstance]
name=commands;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/demoChallenge/commands.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/demoChallenge/commands.jsgf;
rsbscope=/speechrec/psa/commands;
bestpath=no;
autoload=yes;
diff --git a/ps-config/emergencySituation/emergencySituation.conf b/ps-config/emergencySituation/emergencySituation.conf
index dd78d65094b5101367967536f851e7ffae055330..7abd2dee147fc1b4a22d7aaf08c8e5bef14da0dc 100644
--- a/ps-config/emergencySituation/emergencySituation.conf
+++ b/ps-config/emergencySituation/emergencySituation.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/fireInTheApartment/fireInTheApartment.conf b/ps-config/fireInTheApartment/fireInTheApartment.conf
index dd78d65094b5101367967536f851e7ffae055330..7abd2dee147fc1b4a22d7aaf08c8e5bef14da0dc 100644
--- a/ps-config/fireInTheApartment/fireInTheApartment.conf
+++ b/ps-config/fireInTheApartment/fireInTheApartment.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/followMe/followMe.conf b/ps-config/followMe/followMe.conf
index fffc5f3d216238bf459d8aee49b45df339494816..d8807dd728bbe1d79461a257cf9ae9cdf06fa3fa 100644
--- a/ps-config/followMe/followMe.conf
+++ b/ps-config/followMe/followMe.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=followMe;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/followMe/followMe.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/followMe/followMe.jsgf;
rsbscope=/speechrec/psa/followMe;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/followMe/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/followMe/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/gprs/gprs.conf b/ps-config/gprs/gprs.conf
index 6e84e39412d302883796a4160f354728b024359c..9282c65afaa4a36a54d8de4c56d892760cc46117 100644
--- a/ps-config/gprs/gprs.conf
+++ b/ps-config/gprs/gprs.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=gprs;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/gprs/gprs.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/gprs/gprs.jsgf;
rsbscope=/speechrec/psa/gprs;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=gprsPerson;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/gprsPerson/gprsPerson.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/gprsPerson/gprsPerson.jsgf;
rsbscope=/speechrec/psa/gprsPerson;
bestpath=no;
autoload=yes;
@@ -25,8 +25,8 @@ autoload=yes;
[pocketsphinxinstance]
name=location;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/location/location.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/location/location.jsgf;
rsbscope=/speechrec/psa/location;
bestpath=no;
autoload=yes;
@@ -34,8 +34,8 @@ autoload=yes;
[pocketsphinxinstance]
name=object;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/object/object.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/object/object.jsgf;
rsbscope=/speechrec/psa/object;
bestpath=no;
autoload=yes;
@@ -43,8 +43,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
@@ -52,8 +52,8 @@ autoload=yes;
[pocketsphinxinstance]
name=basicFunctionalities;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/basicFunctionalities/basicFunctionalities.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/basicFunctionalities/basicFunctionalities.jsgf;
rsbscope=/speechrec/psa/basicFunctionalities;
bestpath=no;
autoload=yes;
diff --git a/ps-config/inspection/inspection.conf b/ps-config/inspection/inspection.conf
index 53a8ee6170096a789f0a1adcb0eb2ba8fbadf11b..58ad05a8b6f79f69e59daf66c61f81c41f38671b 100644
--- a/ps-config/inspection/inspection.conf
+++ b/ps-config/inspection/inspection.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=leave;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/leave/leave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/leave/leave.jsgf;
rsbscope=/speechrec/psa/leave;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=bironLeave;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/bironLeave/bironLeave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/bironLeave/bironLeave.jsgf;
rsbscope=/speechrec/psa/bironLeave;
bestpath=no;
autoload=yes;
diff --git a/ps-config/inspectionRobot1/inspectionRobot1.conf b/ps-config/inspectionRobot1/inspectionRobot1.conf
index a221a06107f3be09508458d96680241ed7a04016..294b65e59e637e6d16cfc49f16393c78a7a3b73b 100644
--- a/ps-config/inspectionRobot1/inspectionRobot1.conf
+++ b/ps-config/inspectionRobot1/inspectionRobot1.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=leave;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/leave/leave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/leave/leave.jsgf;
rsbscope=/speechrec/psa/leave;
bestpath=no;
autoload=yes;
diff --git a/ps-config/inspectionRobot2/inspectionRobot2.conf b/ps-config/inspectionRobot2/inspectionRobot2.conf
index fe08675c52e1426ec5c509047abada7d5c833100..0562192825bdb6c34ff60a80734d80890b18f688 100644
--- a/ps-config/inspectionRobot2/inspectionRobot2.conf
+++ b/ps-config/inspectionRobot2/inspectionRobot2.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=bironLeave;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/bironLeave/bironLeave.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/bironLeave/bironLeave.jsgf;
rsbscope=/speechrec/psa/bironLeave;
bestpath=no;
autoload=yes;
diff --git a/ps-config/openChallange/openChallange.conf b/ps-config/openChallange/openChallange.conf
index dd78d65094b5101367967536f851e7ffae055330..7abd2dee147fc1b4a22d7aaf08c8e5bef14da0dc 100644
--- a/ps-config/openChallange/openChallange.conf
+++ b/ps-config/openChallange/openChallange.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/openChallenge/openChallenge.conf b/ps-config/openChallenge/openChallenge.conf
index d8c43be5d0f8c87a88f2f19eddcdba5577cfe1ea..e0ca047996576eb3f4945897fe8d0c680fc9dca6 100644
--- a/ps-config/openChallenge/openChallenge.conf
+++ b/ps-config/openChallenge/openChallenge.conf
@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
@@ -17,8 +17,8 @@ autoload=yes;
[pocketsphinxinstance]
name=commands;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/commands/commands.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/commands/commands.jsgf;
rsbscope=/speechrec/psa/commands;
bestpath=no;
autoload=yes;
@@ -26,8 +26,8 @@ autoload=yes;
[pocketsphinxinstance]
name=sfbreview;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/sfb/review.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/sfb/review.jsgf;
rsbscope=/speechrec/psa/sfbreview;
bestpath=no;
autoload=yes;
@@ -35,8 +35,8 @@ autoload=yes;
[pocketsphinxinstance]
name=rsm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/rsm/rsm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/rsm/rsm.jsgf;
rsbscope=/speechrec/psa/rsm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/restaurant/restaurant.conf b/ps-config/restaurant/restaurant.conf
index 4c59234830fabe914639b07fecf0de25b50972b5..894b77b2638b63fe4e0818e4d33f087d313ea7bf 100644
--- a/ps-config/restaurant/restaurant.conf
+++ b/ps-config/restaurant/restaurant.conf
@@ -7,8 +7,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=restaurant;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/restaurant/restaurant.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/restaurant/restaurant.jsgf;
rsbscope=/speechrec/psa/restaurant;
bestpath=no;
autoload=yes;
@@ -16,8 +16,8 @@ autoload=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/confirm/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
diff --git a/ps-config/robotZoo/roboZoo.conf b/ps-config/robotZoo/roboZoo.conf
index 7fa623815e0efab0fe5af86560e01ffb728aafb4..83ee3d1dadf68f7e22678d2df4625a942db90fb9 100644
--- a/ps-config/robotZoo/roboZoo.conf
+++ b/ps-config/robotZoo/roboZoo.conf
@@ -8,8 +8,8 @@ openDeviceDirectly=yes;
[pocketsphinxinstance]
name=confirm;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/robotZoo/confirm.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/robotZoo/confirm.jsgf;
rsbscope=/speechrec/psa/confirm;
bestpath=no;
autoload=yes;
@@ -17,8 +17,8 @@ autoload=yes;
[pocketsphinxinstance]
name=roboZoo;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/robotZoo/roboZoo.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/robotZoo/roboZoo.jsgf;
rsbscope=/speechrec/psa/roboZoo;
bestpath=no;
autoload=yes;
@@ -26,8 +26,8 @@ autoload=yes;
[pocketsphinxinstance]
name=Ask4Task;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/robotZoo/Ask4Task.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/robotZoo/Ask4Task.jsgf;
rsbscope=/speechrec/psa/Ask4Task;
bestpath=no;
autoload=yes;
@@ -35,8 +35,8 @@ autoload=yes;
[pocketsphinxinstance]
name=person;
hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
-dict=/vol/robocup/2014/share/SpeechRec/psConfig/dictionary/tobiDic.dic;
-jsgf=/vol/robocup/2014/share/SpeechRec/psConfig/person/person.jsgf;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/person/person.jsgf;
rsbscope=/speechrec/psa/person;
bestpath=no;
autoload=yes;
diff --git a/ps-grammar/install_pocketsphinx.sh b/ps-grammar/install_pocketsphinx.sh
index 767f361b7dbe4854b350ab7d23fc76fcf94f35d5..af35fa5ee267a767accbfdfdb607afa14360169f 100755
--- a/ps-grammar/install_pocketsphinx.sh
+++ b/ps-grammar/install_pocketsphinx.sh
@@ -9,12 +9,12 @@ if [ ! -n "$prefix" ]; then
exit 1
fi
-mkdir -p ${prefix}/share/SpeechRec/psConfig
+mkdir -p ${prefix}/share/SpeechRec/psGrammar
for i in `ls`
do
if [ -d $i ]
- then cp -r $i ${prefix}/share/SpeechRec/psConfig
+ then cp -r $i ${prefix}/share/SpeechRec/psGrammar
fi
done