diff --git a/DataBrowserPlugins/IrfuPlugin/pom.xml b/DataBrowserPlugins/IrfuPlugin/pom.xml
index 4bab72b17475f9db275379ece737dc6fdc8035f5..6c079e2a8e3767011fb65f7d480e4b3dc72261fa 100644
--- a/DataBrowserPlugins/IrfuPlugin/pom.xml
+++ b/DataBrowserPlugins/IrfuPlugin/pom.xml
@@ -83,7 +83,7 @@
 		</dependency>
 		<!-- MOONArch library -->
 		<dependency>
-			<groupId>heps.epics</groupId>
+			<groupId>fr.cea.irfu.epics</groupId>
 			<artifactId>moonarch-appliance</artifactId>
 			<version>0.0.3</version>
 		</dependency>
@@ -143,6 +143,12 @@
 		<dependency>
 			<groupId>heps.muscade</groupId>
 			<artifactId>muscade-clientapi</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>heps.epics</groupId>
+					<artifactId>CafeJava</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -159,13 +165,13 @@
 		<!-- <Epics api> -->
 		<!-- plc portal parser to get constant -->
 		<dependency>
-			<groupId>heps.epics</groupId>
-			<artifactId>plcparser</artifactId>
-			<version>2.2.5</version>
+			<groupId>fr.cea.irfu.epics</groupId>
+			<artifactId>PLCParserTool</artifactId>
+			<version>2.2.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>heps.epics</groupId>
-			<artifactId>CafeJava</artifactId>
+			<groupId>fr.cea.irfu.epics</groupId>
+			<artifactId>CAFEJava</artifactId>
 			<version>0.0.7</version>
 		</dependency>
 		<dependency>
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java
index 65e0a4cb68bfc82963d137838dfea1028ef1ff73..351e979f7480bc46a73bfdd61662df3fb0143003 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/AbstractEpicsDataSource.java
@@ -11,10 +11,10 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
 import fr.cea.irfu.interfaces.AbstractIrfuDataSource;
 import fr.cea.irfu.interfaces.ParameterAccessor;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.client.ProcessVariableManager;
 
 public abstract class AbstractEpicsDataSource<T> extends AbstractIrfuDataSource<T> {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java
index f0e9ac7e7d06a932e0d18c1e2277e620821caae1..6b2ef63125037978f3bd4be6ef5c801ce49bf6aa 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsBooleanDataSource.java
@@ -11,9 +11,9 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
 import fr.soleil.data.service.GenericDescriptor;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
 
 public class EpicsBooleanDataSource extends AbstractEpicsDataSource<Boolean> {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
index 92a8d601bb7eb7c61c8bd09d6503ed5ae220b82b..3d6947f28fdbb5459eaa6fde2be72940e96e217e 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDataSourceProducer.java
@@ -16,19 +16,19 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
+import fr.cea.irfu.epics.cafejava.interfaces.DataType;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeArrayProcessVariable;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeProcessVariable;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeProcessVariableListener;
+import fr.cea.irfu.epics.cafejava.interfaces.IRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.IocEvent;
 import fr.soleil.data.exception.UnhandledDataTypeException;
 import fr.soleil.data.service.IConstantSourceProducer;
 import fr.soleil.data.service.IDataSourceProducer;
 import fr.soleil.data.service.IKey;
 import fr.soleil.data.source.AbstractDataSource;
-import heps.epics.ca.client.ProcessVariableManager;
-import heps.epics.ca.interfaces.DataType;
-import heps.epics.ca.interfaces.ICafeArrayProcessVariable;
-import heps.epics.ca.interfaces.ICafeProcessVariable;
-import heps.epics.ca.interfaces.ICafeProcessVariableListener;
-import heps.epics.ca.interfaces.IRecord;
-import heps.epics.ca.interfaces.ISimpleRecord;
-import heps.epics.ca.interfaces.IocEvent;
 
 public class EpicsDataSourceProducer
         implements IDataSourceProducer, IConstantSourceProducer, ICafeProcessVariableListener {
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java
index 0ff58c2512c50968af28335a05a59e06d1f781ea..cbc429d2645f1302d8e2ec136005431857339b4d 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsDoubleDataSource.java
@@ -11,9 +11,9 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
 import fr.soleil.data.service.GenericDescriptor;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
 
 public class EpicsDoubleDataSource extends AbstractEpicsDataSource<Double> {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java
index db5082183702a5d956f7d4bbb8d9b9bd54df33a6..db082da72c8c46f7b9384329e2bfdbe936254b83 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsFloatDataSource.java
@@ -11,9 +11,9 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
 import fr.soleil.data.service.GenericDescriptor;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
 
 public class EpicsFloatDataSource extends AbstractEpicsDataSource<Float> {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
index 6b9498dbb5fe9af34e050005c0763b1b9d0414b9..8357545f3618c738999a288b098956adf1bc5559 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsIntegerDataSource.java
@@ -11,9 +11,9 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
 import fr.soleil.data.service.GenericDescriptor;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
 
 public class EpicsIntegerDataSource extends AbstractEpicsDataSource<Integer> {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
index 3ea5c2ae4c8be0dfc083a2b5355a3def574bcd35..edcdcece828173fdc525fe2902dce7fd7355d155 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsKey.java
@@ -17,12 +17,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import fr.cea.irfu.epics.cafejava.interfaces.DataType;
+import fr.cea.irfu.epics.cafejava.interfaces.IRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
+import fr.cea.irfu.epics.cafejava.ioc.FieldEnumeration.RecordType;
 import fr.cea.irfu.interfaces.IrfuKey;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.interfaces.DataType;
-import heps.epics.ca.interfaces.IRecord;
-import heps.epics.ca.interfaces.ISimpleRecord;
-import heps.epics.ca.ioc.FieldEnumeration.RecordType;
 
 public class EpicsKey extends IrfuKey {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java
index 6fcb25c9055bf9e96a9d5c26056abf7800e50234..20deaa496fd743ff63b1a4b2f89744e345a1f924 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsParameterAccessor.java
@@ -11,9 +11,9 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
+import fr.cea.irfu.epics.cafejava.interfaces.ICafeProcessVariable;
 import fr.cea.irfu.interfaces.ParameterAccessor;
-import heps.epics.ca.client.ProcessVariableManager;
-import heps.epics.ca.interfaces.ICafeProcessVariable;
 
 public class EpicsParameterAccessor implements ParameterAccessor {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
index ad93567f44af12c1185e83313594897a8f189abf..ecac41add978b1b502c1c724ae05eb1938389d20 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/epics/EpicsShortDataSource.java
@@ -11,9 +11,9 @@
  ******************************************************************************/
 package fr.cea.irfu.epics;
 
+import fr.cea.irfu.epics.cafejava.common.CafeUtil;
 import fr.soleil.data.service.GenericDescriptor;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.common.CafeUtil;
 
 public class EpicsShortDataSource extends AbstractEpicsDataSource<Short> {
 
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java
index d078f3cb707c7aee24dbfd16d9ff290b3969cec0..ef4c131c78a8d7af50c7810e76ca43709487fa2d 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/fr/cea/irfu/moonarch/MoonArchKey.java
@@ -15,9 +15,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import fr.cea.irfu.epics.cafejava.interfaces.DataType;
 import fr.cea.irfu.interfaces.IrfuKey;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.interfaces.DataType;
 import heps.epics.moonarch.interfaces.IPVData;
 import heps.epics.moonarch.interfaces.MoonArchiverException;
 import heps.epics.moonarch.model.MoonArchiverAPI;
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java
index 7f37722ab6cec4e1e87f1d39395a22756a3d85cb..76c7da9a1b5889ef031a8a4ea9aeb82806165807 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceBrowser.java
@@ -23,13 +23,13 @@ import org.cdma.gui.databrowser.view.tree.SourceTreeNode;
 
 import fr.cea.irfu.epics.EpicsDataSourceProducer;
 import fr.cea.irfu.epics.EpicsKey;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
 import fr.soleil.comete.definition.widget.util.ITreeNode;
 import fr.soleil.data.service.DataSourceProducerProvider;
 import fr.soleil.data.service.HistoryKey;
 import fr.soleil.data.service.IKey;
 import fr.soleil.data.service.PolledRefreshingStrategy;
 import fr.soleil.data.source.HistoryDataSourceProducer;
-import heps.epics.ca.interfaces.ISimpleRecord;
 
 public class EpicsDataSourceBrowser extends AbstractDataSourceProducerBrowser {
 
@@ -203,8 +203,8 @@ public class EpicsDataSourceBrowser extends AbstractDataSourceProducerBrowser {
         }
 
         if (record != null) {
-            heps.epics.ca.interfaces.DataType dataType = record.getDataType();
-            if (dataType == heps.epics.ca.interfaces.DataType.STRING) {
+            fr.cea.irfu.epics.cafejava.interfaces.DataType dataType = record.getDataType();
+            if (dataType == fr.cea.irfu.epics.cafejava.interfaces.DataType.STRING) {
                 format = DataFormat.TEXT;
             } else {
                 if (record.isBoolean()) {
@@ -275,7 +275,7 @@ public class EpicsDataSourceBrowser extends AbstractDataSourceProducerBrowser {
             IKey deviceKey = EpicsKey.getDeviceKey(key);
             String deviceName = EpicsKey.getKeyName(deviceKey);
             String paramName = EpicsKey.getKeyName(key);
-            heps.epics.ca.interfaces.DataType dataType = EpicsKey.getFormat(key);
+            fr.cea.irfu.epics.cafejava.interfaces.DataType dataType = EpicsKey.getFormat(key);
             informations.put(LABEL_INFO + "Host", host);
             informations.put(LABEL_INFO + "Device", deviceName);
             informations.put(LABEL_INFO + "Name", paramName);
diff --git a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java
index 99662b9bbe9c8a508074c32be0f105be0fd839a5..336c0ac6809882a4d6a59b0f2faba78991b7c7bd 100644
--- a/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java
+++ b/DataBrowserPlugins/IrfuPlugin/src/main/java/org/cdma/gui/databrowser/impl/epics/EpicsDataSourceSeeker.java
@@ -34,12 +34,12 @@ import org.cdma.gui.databrowser.interfaces.IDataSourceBrowser;
 import org.jdesktop.swingx.prompt.PromptSupport;
 
 import fr.cea.irfu.epics.EpicsKey;
+import fr.cea.irfu.epics.cafejava.client.ProcessVariableManager;
+import fr.cea.irfu.epics.cafejava.interfaces.IRecord;
+import fr.cea.irfu.epics.cafejava.interfaces.ISimpleRecord;
+import fr.cea.irfu.epics.plcparsertool.interfaces.IPlcIoc;
+import fr.cea.irfu.epics.plcparsertool.model.ioc.PlcParserApi;
 import fr.soleil.data.service.IKey;
-import heps.epics.ca.client.ProcessVariableManager;
-import heps.epics.ca.interfaces.IRecord;
-import heps.epics.ca.interfaces.ISimpleRecord;
-import heps.epics.plcparser.interfaces.IPlcIoc;
-import heps.epics.plcparser.model.ioc.PlcParserApi;
 
 public class EpicsDataSourceSeeker extends AbstractFileDataSourceSeeker {
     private static JPanel containPane = null;