diff --git a/EC-GN-JA-PCF-IN/pom.xml b/EC-GN-JA-PCF-IN/pom.xml
new file mode 100755
index 0000000..f772f8d
--- /dev/null
+++ b/EC-GN-JA-PCF-IN/pom.xml
@@ -0,0 +1,217 @@
+<!--
+$HeadURL: https://svnpub.codac.iter.org/codac/iter/codac/dev/units/m-codac-unit-api/branches/codac-core-6.1/src/main/resources/pom-unit.xml $
+$Id: pom-unit.xml 96475 2019-01-09 13:47:38Z sivecm $
+
+Project       : CODAC Core System
+
+Description   : Project description file for a CODAC Core System subsystem
+
+Authors       : This file was generated by CODAC development toolkit
+
+Copyright (c) : 2010-2019 ITER Organization,
+     CS 90 046
+     13067 St. Paul-lez-Durance Cedex
+     France
+
+This file is part of ITER CODAC software.
+For the terms and conditions of redistribution or use of this software.
+refer to the file ITER-LICENSE.TXT located in the top level directory.
+of the distribution package..
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.iter.codac.units</groupId>
+    <artifactId>EC-GN-JA-PCF</artifactId>
+    <packaging>codac</packaging>
+    <version>1.0.0</version>
+    <name>CODAC Core System EC-GN subsystem</name>
+    <description>CODAC Core System EC-GN subsystem</description>
+    <url>http://www.iter.org/</url>
+
+    <!-- project properties -->
+    <properties>
+        <unit.type>subsystem</unit.type>
+        <project.type>iandc</project.type>
+        <rpm.vcs.url>%(/opt/tools/get-vcs-url.sh --path=${project.basedir})</rpm.vcs.url>
+    </properties>
+
+    <!-- parent pom.xml -->
+    <parent>
+        <groupId>org.iter.codac.units</groupId>
+        <artifactId>maven-iter-settings</artifactId>
+        <version>6.3.0</version>
+    </parent>
+
+    <!-- unit owner and developers -->
+    <developers>
+        <developer>
+            <id>ferrog</id>
+            <roles>
+                <role>unit owner</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <!-- configuration of how the project is built -->
+    <build>
+        <!-- default phase is compile -->
+        <defaultGoal>compile</defaultGoal>
+        <!-- this command is executed if you just write 'mvn' -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-iter-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <packaging>
+                        <rpmspec file="unit.spec">
+                            <source>src</source>
+                            <define macroname="project_artifactId">${project.artifactId}</define>
+                            <define macroname="project_version">${project.version}</define>
+                            <define macroname="project_description">${project.description}</define>
+                        </rpmspec>
+                        <package name="EC-GN-PSH0PCF-ioc">
+                            <url>${rpm.vcs.url}</url>
+                            <include name="EC-GN-PSH0PCF" type="ioc" />
+                        </package>
+                        <package name="EC-GN-PCF0SYSM-ioc">
+                            <include name="EC-GN-PCF0SYSM" type="ioc" />
+                        </package>
+                        <package name="${project.artifactId}-lib">
+                            <url>${rpm.vcs.url}</url>
+                            <include type="config" 
+                                source="main/ld.so.conf" 
+                                target="ld.so.conf.d/codac-${project.artifactId}.conf" 
+                                mvneval="true" rpmeval="true" 
+                                altpath="%{_sysconfdir}/ld.so.conf.d/codac-${project.artifactId}.conf" />                            
+                            <!-- Library, etc. -->
+                            <!-- DataSources -->
+                            <include type="file" source="obj/Build/x86-linux/DataSources/JAEPICSCA/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/DataSources/NI6528/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/DataSources/RandomDataSource/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <!-- GAMs -->
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JABitReverseGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JABitSumGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JAConditionalSignalUpdateGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JAMessageGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JAModeControlGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JAPreProgrammedGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JARampupGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JARTStateMachineGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JASDNRTStateMachineGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JASourceChoiseGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JATerminalInterfaceGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JATriangleWaveGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <include type="file" source="obj/Build/x86-linux/GAMs/JAWFRecordGAM/" target="${project.artifactId}/lib">
+                                <include>*.so</include>
+                            </include>
+                            <!-- Config files -->
+                            <include type="file" 
+                                source="main/resources/qst-gyrotron-fast-controller/Configurations/"
+                                targetroot="SYSTEM_ROOT"
+                                target="/etc/opt/codac/${project.artifactId}">
+                                <include>*</include>
+                            </include>                            
+                            <!-- Scripts -->
+                            <include type="script"
+                                scriptType="helper"
+                                file="ec-gn-ja-pcf-gy.sh"
+                                rpmeval="true" mvneval="true" />
+                            <scriptlet type="posttrans">
+                                <![CDATA[ ldconfig ]]>
+                                <!-- Bug 12126 - Remove verbose mode -->
+                            </scriptlet>
+                            <requires version="current">%{codac_rpm_prefix}-marte-core</requires>
+                            <requires version="current">%{codac_rpm_prefix}-epics-devel</requires>
+                            <requires version="current">%{codac_rpm_prefix}-marte-core-devel</requires>
+                            <requires version="current">%{codac_rpm_prefix}-marte-components</requires>
+                            <requires version="current">%{codac_rpm_prefix}-marte-components-sdn</requires>
+                            <requires version="current">%{codac_rpm_prefix}-marte-components-dan</requires>
+                            <requires version="current">%{codac_rpm_prefix}-marte-components-epics</requires>
+                            <requires buildonly="true">%{codac_rpm_prefix}-marte-components-devel</requires>
+                            <requires version="current">%{codac_rpm_prefix}-marte-extensions</requires>
+                            <requires buildonly="true">%{codac_rpm_prefix}-marte-extensions-devel</requires>
+                        </package>
+                        <package name="${project.artifactId}-services">
+                            <url>${rpm.vcs.url}</url>
+                            <include type="multiservice"
+                                name="ec-gn-ja-services" autostart="true"
+                                description="EC-GN-JA related services" />
+                            <include type="service"
+                                name="ec-gn-ja-pcf-gya"
+                                target="ec-gn-ja-services" autostart="true">
+                                <description>EC-GN-JA-PCF GYA daemon</description>
+                                <servicetype>simple</servicetype>
+                                <user>root</user>
+                                <group>root</group>
+                                <execstart>%{codac_bin}/ec-gn-ja-pcf-gy.sh JAGyrotronA_FY19_P1.cfg</execstart>
+                            </include>
+                            <!-- Soft dependencies and service ordering -->
+                            <include type="file" source="-"
+                                targetroot="SYSTEM_ROOT"
+                                target="%{_unitdir}/%{codac_service_prefix}-ec-gn-ja-pcf-gya.service.d/override.conf"
+                                rpmeval="true">
+<![CDATA[[Unit]
+Wants=%{codac_service_prefix}-${project.artifactId}-PSH0PCF-ioc.service
+After=%{codac_service_prefix}-${project.artifactId}-PSH0PCF-ioc.service]]>
+<![CDATA[[Service]
+KillSignal=SIGINT]]>
+                            </include>
+                            <include type="service"
+                                name="ec-gn-ja-pcf-gyb"
+                                target="ec-gn-ja-services" autostart="true">
+                                <description>EC-GN-JA-PCF GYB daemon</description>
+                                <servicetype>simple</servicetype>
+                                <user>root</user>
+                                <group>root</group>
+                                <execstart>%{codac_bin}/ec-gn-ja-pcf-gy.sh JAGyrotronB_FY19_P1.cfg</execstart>
+                            </include>
+                            <!-- Soft dependencies and service ordering -->
+                            <include type="file" source="-"
+                                targetroot="SYSTEM_ROOT"
+                                target="%{_unitdir}/%{codac_service_prefix}-ec-gn-ja-pcf-gyb.service.d/override.conf"
+                                rpmeval="true">
+<![CDATA[[Unit]
+Wants=%{codac_service_prefix}-${project.artifactId}-PSH0PCF-ioc.service
+After=%{codac_service_prefix}-${project.artifactId}-PSH0PCF-ioc.service]]>
+<![CDATA[[Service]
+KillSignal=SIGINT]]>
+                            </include>
+                            <requires version="current">%{codac_rpm_prefix}-${project.artifactId}-lib</requires>
+                        </package>
+                    </packaging>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/EC-GN-JA-PCF-IN/src/main/ld.so.conf b/EC-GN-JA-PCF-IN/src/main/ld.so.conf
new file mode 100644
index 0000000..225383c
--- /dev/null
+++ b/EC-GN-JA-PCF-IN/src/main/ld.so.conf
@@ -0,0 +1 @@
+%{codac_root}/@@project.artifactId@@/lib
diff --git a/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh b/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh
new file mode 100644
index 0000000..6ad8133
--- /dev/null
+++ b/EC-GN-JA-PCF-IN/src/main/scripts/ec-gn-ja-pcf-gy.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+. codacenv reload
+
+PROJ=EC-GN-JA-PCF
+CFG=$1
+
+SRC=${CODAC_VAR}/${PROJ}/${CFG}
+FOLDER=${CODAC_VAR}/${PROJ}
+if [[ ! -d ${FOLDER} ]]; then
+  mkdir -p ${FOLDER}
+fi
+
+/bin/cp -f ${SRC} ${FOLDER}
+
+${MARTe2_DIR}/Bin/MARTeApp.ex -f ${FOLDER}/${CFG} -l RealTimeLoader -m StateMachine:Start