diff --git a/.gitattributes b/.gitattributes
index 9289de05418df5e81e2bddd5fd42220e844f61dd..652c63a9c5727374b4a8e4b7a528e60436261ea0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1982,8 +1982,6 @@ CMake/variants/variants.lofar17 -text
 CMake/variants/variants.macdiepen -text
 CMake/variants/variants.mars -text
 CMake/variants/variants.sas099 -text
-JAVA/CEP/jParmFacade/conf/Plotter-config-jparmfacade.jar -text
-JAVA/CEP/jParmFacade/pom.xml -text
 JAVA/GUI/Plotter/.cvsignore -text
 JAVA/GUI/Plotter/PlotterConfig/.cvsignore -text
 JAVA/GUI/Plotter/PlotterConfig/nbproject/.cvsignore -text
@@ -3881,6 +3879,8 @@ SAS/OTB/jOTDB3/test/tTreeMaintenance.in -text
 SAS/OTB/jOTDB3/test/tTreeMaintenance.java -text
 SAS/OTB/jOTDB3/test/tTreeMaintenance.log_prop -text
 SAS/OTB/jOTDB3/test/testStates.java -text
+SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar -text
+SAS/OTB/jParmFacade/pom.xml -text
 SAS/OTB/jRSP/.cvsignore -text
 SAS/OTB/jRSP/pom.xml -text
 SAS/OTB/scripts/CMakeLists.txt -text
diff --git a/.gitignore b/.gitignore
index e64a63e818011c7d343f93dda320dac9c52389ee..7603b5aab09526133a980ba17b1aaceb1209d962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,13 +26,6 @@ CEP/pyparmdb/Makefile.common
 CEP/pyparmdb/autoconf_share
 CEP/pyparmdb/lofarconf
 CEP/pyparmdb/py-compile
-JAVA/CEP/jParmFacade/Makefile.common
-JAVA/CEP/jParmFacade/autoconf_share
-JAVA/CEP/jParmFacade/build
-JAVA/CEP/jParmFacade/dist
-JAVA/CEP/jParmFacade/lofarconf
-JAVA/CEP/jParmFacade/nbproject
-JAVA/CEP/jParmFacade/target
 JAVA/GUI/Plotter/PlotterConfig/build
 JAVA/GUI/Plotter/PlotterConfig/dist
 JAVA/GUI/Plotter/PlotterConfig/nbproject/private
@@ -259,6 +252,13 @@ SAS/OTB/RSP/src/nl/astron/lofar/java/gui/mac/jrsp/subbandstats/WaveformSettingsL
 SAS/OTB/jOTDB3/build
 SAS/OTB/jOTDB3/dist
 SAS/OTB/jOTDB3/target
+SAS/OTB/jParmFacade/Makefile.common
+SAS/OTB/jParmFacade/autoconf_share
+SAS/OTB/jParmFacade/build
+SAS/OTB/jParmFacade/dist
+SAS/OTB/jParmFacade/lofarconf
+SAS/OTB/jParmFacade/nbproject
+SAS/OTB/jParmFacade/target
 SAS/OTB/jRSP/Makefile.am
 SAS/OTB/jRSP/autoconf_share
 SAS/OTB/jRSP/bootstrap
diff --git a/JAVA/CEP/jParmFacade/Makefile.am b/SAS/OTB/jParmFacade/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/Makefile.am
rename to SAS/OTB/jParmFacade/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/bootstrap b/SAS/OTB/jParmFacade/bootstrap
similarity index 100%
rename from JAVA/CEP/jParmFacade/bootstrap
rename to SAS/OTB/jParmFacade/bootstrap
diff --git a/JAVA/CEP/jParmFacade/build.xml b/SAS/OTB/jParmFacade/build.xml
similarity index 100%
rename from JAVA/CEP/jParmFacade/build.xml
rename to SAS/OTB/jParmFacade/build.xml
diff --git a/JAVA/CEP/jParmFacade/conf/Plotter-config-jparmfacade.jar b/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar
similarity index 100%
rename from JAVA/CEP/jParmFacade/conf/Plotter-config-jparmfacade.jar
rename to SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar
diff --git a/JAVA/CEP/jParmFacade/configure.in b/SAS/OTB/jParmFacade/configure.in
similarity index 100%
rename from JAVA/CEP/jParmFacade/configure.in
rename to SAS/OTB/jParmFacade/configure.in
diff --git a/JAVA/CEP/jParmFacade/include/Makefile.am b/SAS/OTB/jParmFacade/include/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/Makefile.am
rename to SAS/OTB/jParmFacade/include/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am b/SAS/OTB/jParmFacade/include/jParmFacade/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/jParmFacade/Makefile.am
rename to SAS/OTB/jParmFacade/include/jParmFacade/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h b/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h
rename to SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h
diff --git a/JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h b/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h
similarity index 100%
rename from JAVA/CEP/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h
rename to SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h
diff --git a/JAVA/CEP/jParmFacade/jParmFacade.spec.in b/SAS/OTB/jParmFacade/jParmFacade.spec.in
similarity index 100%
rename from JAVA/CEP/jParmFacade/jParmFacade.spec.in
rename to SAS/OTB/jParmFacade/jParmFacade.spec.in
diff --git a/JAVA/CEP/jParmFacade/manifest.mf b/SAS/OTB/jParmFacade/manifest.mf
similarity index 100%
rename from JAVA/CEP/jParmFacade/manifest.mf
rename to SAS/OTB/jParmFacade/manifest.mf
diff --git a/JAVA/CEP/jParmFacade/pom.xml b/SAS/OTB/jParmFacade/pom.xml
similarity index 100%
rename from JAVA/CEP/jParmFacade/pom.xml
rename to SAS/OTB/jParmFacade/pom.xml
diff --git a/JAVA/CEP/jParmFacade/src/Makefile.am b/SAS/OTB/jParmFacade/src/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/Makefile.am
rename to SAS/OTB/jParmFacade/src/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.java
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacade.log_prop
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeAdapter.java
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeInterface.java
diff --git a/JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java
rename to SAS/OTB/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/jParmFacadeServer.java
diff --git a/JAVA/CEP/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc b/SAS/OTB/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc
similarity index 100%
rename from JAVA/CEP/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc
rename to SAS/OTB/jParmFacade/src/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc
diff --git a/JAVA/CEP/jParmFacade/test/Makefile.am b/SAS/OTB/jParmFacade/test/Makefile.am
similarity index 100%
rename from JAVA/CEP/jParmFacade/test/Makefile.am
rename to SAS/OTB/jParmFacade/test/Makefile.am
diff --git a/JAVA/CEP/jParmFacade/test/tParmFacade.java b/SAS/OTB/jParmFacade/test/tParmFacade.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/test/tParmFacade.java
rename to SAS/OTB/jParmFacade/test/tParmFacade.java
diff --git a/JAVA/CEP/jParmFacade/test/tRemoteParmFacade.java b/SAS/OTB/jParmFacade/test/tRemoteParmFacade.java
similarity index 100%
rename from JAVA/CEP/jParmFacade/test/tRemoteParmFacade.java
rename to SAS/OTB/jParmFacade/test/tRemoteParmFacade.java