diff --git a/demo/CentralScheduling/EPTF_CS_demo.prj b/demo/CentralScheduling/EPTF_CS_demo.prj
index ce53178..c0225c2 100644
--- a/demo/CentralScheduling/EPTF_CS_demo.prj
+++ b/demo/CentralScheduling/EPTF_CS_demo.prj
@@ -120,7 +120,15 @@
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.cc" />
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.hh" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
         </File_Groups>
     </File_Group>
 </Project>
diff --git a/demo/DataSource/EPTF_DataSource_Demo.prj b/demo/DataSource/EPTF_DataSource_Demo.prj
index 688ce5b..2b993e7 100644
--- a/demo/DataSource/EPTF_DataSource_Demo.prj
+++ b/demo/DataSource/EPTF_DataSource_Demo.prj
@@ -41,7 +41,13 @@
             <File_Group path="../../src/Scheduler/EPTF_CLL_Scheduler.grp" />
             <File_Group path="../../src/Variable/EPTF_CLL_Variable.grp" />
             <File_Group path="../../src/DataSource/EPTF_CLL_DataSource.grp" />
-            <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+            </File_Group>
             <File_Group name="TelnetAsp" >
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
diff --git a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
index b39d079..95f3001 100644
--- a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
+++ b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
@@ -71,7 +71,15 @@
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
             <File_Group name="TCCUseful" >
diff --git a/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj b/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj
index 7f6aadd..041afdc 100644
--- a/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj
+++ b/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj
@@ -87,7 +87,15 @@
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
             <File_Group name="TCCUseful" >
diff --git a/demo/ExecCtrl/ExecCtrl_demo.prj b/demo/ExecCtrl/ExecCtrl_demo.prj
index dab7610..82add44 100644
--- a/demo/ExecCtrl/ExecCtrl_demo.prj
+++ b/demo/ExecCtrl/ExecCtrl_demo.prj
@@ -79,7 +79,15 @@
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
             <File_Group name="TCCUseful" >
diff --git a/demo/GUIViewer/GUIViewer_Demo.prj b/demo/GUIViewer/GUIViewer_Demo.prj
index e86253b..5bc470b 100644
--- a/demo/GUIViewer/GUIViewer_Demo.prj
+++ b/demo/GUIViewer/GUIViewer_Demo.prj
@@ -76,7 +76,15 @@
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
             <File_Group name="TCCUseful" >
diff --git a/demo/HostAdmin/EPTF_HostAdmin_demo.prj b/demo/HostAdmin/EPTF_HostAdmin_demo.prj
index 1ff8921..5e9a3e7 100644
--- a/demo/HostAdmin/EPTF_HostAdmin_demo.prj
+++ b/demo/HostAdmin/EPTF_HostAdmin_demo.prj
@@ -55,7 +55,15 @@
             <File_Group path="../../src/RedBlackTree/EPTF_CLL_RBT.grp" />
             <File_Group path="../../src/StatMeasure/EPTF_CLL_StatMeasure.grp" />
             <File_Group path="LOADMEASasp.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group path="PIPEasp.grp" />
             <File_Group path="../Logging/XTDPasp.grp" />
             <File_Group path="../Logging/TELNETasp.grp" />
diff --git a/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj b/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
index c13dbde..4f43808 100644
--- a/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
+++ b/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
@@ -61,7 +61,15 @@
                         <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.hh" />
                         <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_Types.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                     <File_Group name="TELNETAsp" >
                       <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                       <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
diff --git a/demo/Logging/LoggingUI.prj b/demo/Logging/LoggingUI.prj
index a4fa064..0a72e72 100644
--- a/demo/Logging/LoggingUI.prj
+++ b/demo/Logging/LoggingUI.prj
@@ -46,7 +46,15 @@
             <File_Group path="TCCUsefulFunctions.grp" />
             <File_Group path="TELNETasp.grp" />
             <File_Group path="XTDPasp.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
         </File_Groups>
     </File_Group>
 </Project>
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj
index a028c26..c0f3bff 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj
@@ -91,7 +91,15 @@
                 <File path="../../../../../TCCUsefulFunctions_CNL113472/src/TCCMaths_Functions.ttcn" />
                 <File path="../../../../../TCCUsefulFunctions_CNL113472/src/TCCMaths_GenericTypes.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="testports" >
                 <File path="../../../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
                 <File path="../../../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
diff --git a/demo/StatHandler/EPTF_StatHandler_Demo.prj b/demo/StatHandler/EPTF_StatHandler_Demo.prj
index 3e13828..671fd8b 100644
--- a/demo/StatHandler/EPTF_StatHandler_Demo.prj
+++ b/demo/StatHandler/EPTF_StatHandler_Demo.prj
@@ -50,7 +50,15 @@
             <File_Group path="../Logging/TCCUsefulFunctions.grp" />
             <File_Group path="../Logging/TELNETasp.grp" />
             <File_Group path="../Logging/XTDPasp.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
                     <File_Group name="Maths" >
diff --git a/demo/StatManager/EPTF_StatManager_demo.prj b/demo/StatManager/EPTF_StatManager_demo.prj
index ce3bf46..a300c0f 100644
--- a/demo/StatManager/EPTF_StatManager_demo.prj
+++ b/demo/StatManager/EPTF_StatManager_demo.prj
@@ -59,13 +59,23 @@
             <File_Group name="EPTF_StatManager_demo" >
                 <File path="EPTF_StatManager_demo.ttcn" />
             </File_Group>            
-            <File_Group path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API.grp" />            
+            <File_Group name="Socket_API" >
+                <File path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API_Definitions.ttcn" />
+            </File_Group>
             <File_Group name="TelnetAsp" >
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="Useful" >
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCEncoding.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCEncoding_Functions.ttcn" />
diff --git a/demo/StatReplay/StatReplay_Demo.prj b/demo/StatReplay/StatReplay_Demo.prj
index a489b9d..ee77632 100644
--- a/demo/StatReplay/StatReplay_Demo.prj
+++ b/demo/StatReplay/StatReplay_Demo.prj
@@ -83,7 +83,15 @@
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group path="../../src/Logging/EPTF_CLL_LoggingUI.grp" />
         </File_Groups>
     </File_Group>
diff --git a/demo/TimeProfileEditor/TimeProfileEditor.prj b/demo/TimeProfileEditor/TimeProfileEditor.prj
index 40f431e..4d3a4f3 100644
--- a/demo/TimeProfileEditor/TimeProfileEditor.prj
+++ b/demo/TimeProfileEditor/TimeProfileEditor.prj
@@ -47,11 +47,13 @@
             <File_Group path="../../src/Transport/EPTF_CLL_TransportCommPortIPL4.grp" />
             <File_Group path="../../src/Transport/EPTF_CLL_TransportMessageBufferManager.grp" />
             <File_Group path="../../src/Scheduler/EPTF_CLL_Scheduler.grp" />
-            <File_Group name="XTDP protocol module" >
-               <File_Groups>
-                   <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-               </File_Groups>
-            </File_Group>	
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+            </File_Group>
             <File_Group name="AbstractSocket" >
                 <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
                 <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
@@ -71,7 +73,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCConversion_Functions.ttcn" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCConversion.cc" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
         </File_Groups>
     </File_Group>
 </Project>
diff --git a/demo/Transport/Transport_Demo.prj b/demo/Transport/Transport_Demo.prj
index fd837b7..1c211b4 100755
--- a/demo/Transport/Transport_Demo.prj
+++ b/demo/Transport/Transport_Demo.prj
@@ -46,8 +46,18 @@
             <File_Group path="../../../../Libraries/EPTF_Core_Library_CNL113512/src/RedBlackTree/EPTF_CLL_RBtree.grp" />
             <File_Group path="../../../../Libraries/EPTF_Core_Library_CNL113512/src/Scheduler/EPTF_CLL_Scheduler.grp" />
             <File_Group path="../../../../Libraries/EPTF_Core_Library_CNL113512/src/Semaphore/EPTF_CLL_Semaphore.grp" />
-            <File_Group path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="Socket_API" >
+                <File path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API_Definitions.ttcn" />
+            </File_Group>
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="TCC_Useful" >
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCFileIO.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCFileIO_Functions.ttcn" />
diff --git a/demo/UIHandler/UIHandler_DataSource_Demo.prj b/demo/UIHandler/UIHandler_DataSource_Demo.prj
index 28ce954..8fb7262 100644
--- a/demo/UIHandler/UIHandler_DataSource_Demo.prj
+++ b/demo/UIHandler/UIHandler_DataSource_Demo.prj
@@ -75,7 +75,15 @@
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
             <File_Group name="TCCUseful" >
diff --git a/demo/UIHandler/UI_Handler_Test.prj b/demo/UIHandler/UI_Handler_Test.prj
index ee30c40..ce248a9 100644
--- a/demo/UIHandler/UI_Handler_Test.prj
+++ b/demo/UIHandler/UI_Handler_Test.prj
@@ -93,7 +93,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCConversion_Functions.ttcn" />
 		<File path="../../../TCCUsefulFunctions_CNL113472/src/TCCConversion.cc" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="UI_Handler_Test" >
                 <File path="UI_Handler_Test.ttcn" />
             </File_Group>
diff --git a/src/DataSource/EPTF_CLL_DataSource_Dep.grp b/src/DataSource/EPTF_CLL_DataSource_Dep.grp
index c74c786..db15833 100755
--- a/src/DataSource/EPTF_CLL_DataSource_Dep.grp
+++ b/src/DataSource/EPTF_CLL_DataSource_Dep.grp
@@ -20,7 +20,13 @@
     <File_Group path="../Semaphore/EPTF_CLL_Semaphore_Dep.grp" />
     <File_Group path="../HashMap/EPTF_CLL_HashMap_Dep.grp" />
     <File_Group path="../CommandLineInterface/EPTF_CLL_CommandLineInterface_Dep.grp" />
-    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+    <File_Group name="XTDP" >
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+    </File_Group>
     <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCFileIO_Functions.ttcn" />
     <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCFileIO.cc" />
     <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCDateTime_Functions.ttcn" />
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp b/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp
index 12c6165..7d5a78e 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp
@@ -31,7 +31,15 @@
     <File path="Api/Python/RequestSchema.json" />
     <File_Groups>
         <File_Group path="../Base/EPTF_CLL_Base.grp" />
-        <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+        <File_Group name="IPL4" >
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+        </File_Group>
         <File_Group name="Useful" >
             <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCEncoding.cc" />
             <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCEncoding_Functions.ttcn" />
@@ -42,6 +50,8 @@
             <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCFileIO.cc" />
             <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCFileIO_Functions.ttcn" />
         </File_Group>        
-        <File_Group path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API.grp" />
+        <File_Group name="Socket_API" >
+            <File path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API_Definitions.ttcn" />
+        </File_Group>
     </File_Groups>
 </File_Group>
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp
index d62b643..466d5cb 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp
@@ -26,6 +26,9 @@
             <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_PortType.ttcn"/>
             <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_Types.ttcn"/>
         </File_Group>
-        <File_Group path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.grp"/>
+        <File_Group name="AbstractSocket" >
+            <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
+            <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
+        </File_Group>
     </File_Group>
 </FileGroup>
diff --git a/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp b/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp
index e90c0b3..2f87899 100755
--- a/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp
+++ b/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp
@@ -27,6 +27,9 @@
         <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_PortType.ttcn"/>
         <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_Types.ttcn"/>
     </File_Group>
-    <File_Group path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.grp" />
+    <File_Group name="AbstractSocket" >
+        <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
+        <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
+    </File_Group>
   </File_Group>
 </FileGroup>
diff --git a/src/Transport/EPTF_CLL_Transport_Common.grp b/src/Transport/EPTF_CLL_Transport_Common.grp
index c837ad1..25b522e 100644
--- a/src/Transport/EPTF_CLL_Transport_Common.grp
+++ b/src/Transport/EPTF_CLL_Transport_Common.grp
@@ -13,7 +13,16 @@
 <File_Group name="EPTF_CLL_Transport_Common" >
     <File path="EPTF_CLL_Transport_CommonDefinitions.ttcn" />
     <File_Groups>
-        <File_Group path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API.grp" />
-        <File_Group path="../../../../ProtocolModules/COMMON/src/ProtocolModules_Common.grp" />
+        <File_Group name="Socket_API" >
+            <File path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API_Definitions.ttcn" />
+        </File_Group>
+        <File_Group name="ProtocolModules_Common" >
+          <File path="../../../../ProtocolModules/COMMON/src/General_Types.ttcn" />
+          <File path="../../../../ProtocolModules/COMMON/src/MobileDomainDefinitions.asn" />
+          <File path="../../../../ProtocolModules/COMMON/src/UsefulTtcn3Types.ttcn" />
+          <File path="../../../../ProtocolModules/COMMON/src/XSD.ttcn" />
+          <File path="../../../../ProtocolModules/COMMON/src/general_typedefs.ttcn" />
+          <File path="../../../../ProtocolModules/COMMON/src/http_www_w3_org_XML_1998_namespace.ttcn" />
+        </File_Group>
     </File_Groups>
 </File_Group>
diff --git a/src/Transport/EPTF_CLL_Transport_Dep.grp b/src/Transport/EPTF_CLL_Transport_Dep.grp
index 84275c0..b26d833 100755
--- a/src/Transport/EPTF_CLL_Transport_Dep.grp
+++ b/src/Transport/EPTF_CLL_Transport_Dep.grp
@@ -26,9 +26,23 @@
       <File_Group path="../Semaphore/EPTF_CLL_Semaphore_Dep.grp" />
       <File_Group path="../FreeBusyQueue/EPTF_CLL_FreeBusyQueue_Dep.grp" />
       <File_Group path="../Logging/EPTF_CLL_Logging_Dep.grp" />
-      <File_Group path="../../../../ProtocolModules/COMMON/src/ProtocolModules_Common.grp" />
-      <File_Group path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API.grp" />
-      <File_Group path="../../../../TestPorts/LANL2asp_CNL113519/src/LANL2.grp" />
+      <File_Group name="ProtocolModules_Common" >
+        <File path="../../../../ProtocolModules/COMMON/src/General_Types.ttcn" />
+        <File path="../../../../ProtocolModules/COMMON/src/MobileDomainDefinitions.asn" />
+        <File path="../../../../ProtocolModules/COMMON/src/UsefulTtcn3Types.ttcn" />
+        <File path="../../../../ProtocolModules/COMMON/src/XSD.ttcn" />
+        <File path="../../../../ProtocolModules/COMMON/src/general_typedefs.ttcn" />
+        <File path="../../../../ProtocolModules/COMMON/src/http_www_w3_org_XML_1998_namespace.ttcn" />
+      </File_Group>
+      <File_Group name="Socket_API" >
+          <File path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API_Definitions.ttcn" />
+      </File_Group>
+      <File_Group name="LANL2" >
+          <File path="../../../../TestPorts/LANL2asp_CNL113519/src/LANL2asp_PT.cc" />
+          <File path="../../../../TestPorts/LANL2asp_CNL113519/src/LANL2asp_PT.hh" />
+          <File path="../../../../TestPorts/LANL2asp_CNL113519/src/LANL2asp_PortType.ttcn" />
+          <File path="../../../../TestPorts/LANL2asp_CNL113519/src/LANL2asp_Types.ttcn" />	
+      </File_Group>
       <File_Group name="IP_CNL113418" >
           <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_EncDec.cc" />
           <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_Types.ttcn" />
diff --git a/src/UIHandler/EPTF_CLL_UIHandler.grp b/src/UIHandler/EPTF_CLL_UIHandler.grp
index d1e1780..0c29e98 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler.grp
@@ -40,10 +40,12 @@
     <File path="rapidxml/rapidxml.hh" />
     <File path="rapidxml/rapidxml_print.hh" />
     <File_Groups>
-        <File_Group name="XTDP protocol module" >
-            <File_Groups>
-                <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-            </File_Groups>
+        <File_Group name="XTDP" >
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
         </File_Group>
         <File_Group path="../DataSource/EPTF_CLL_DataSource.grp" />
         <File_Group path="../RingBuffer/EPTF_CLL_RingBuffer.grp" />
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Base.grp b/src/UIHandler/EPTF_CLL_UIHandler_Base.grp
index 855d08b..a25a98b 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_Base.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Base.grp
@@ -32,10 +32,12 @@
     <File path="../CommandLineInterface/EPTF_CLL_CLI_Functions.ttcn" />
     <File path="EPTF_CLL_UIHandler_XSD_XTDPTemplateDefinitions.ttcn" />
     <File_Groups>
-        <File_Group name="XTDP protocol module" >
-            <File_Groups>
-                <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-            </File_Groups>
+        <File_Group name="XTDP" >
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+            <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
         </File_Group>
         <File_Group path="../DataSource/EPTF_CLL_DataSource.grp" />
         <File_Group path="../RingBuffer/EPTF_CLL_RingBuffer.grp" />
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp b/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp
index cf3fe89..2c38dbb 100755
--- a/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp
@@ -25,7 +25,13 @@
     <File_Group path="../Transport/EPTF_CLL_TransportCommPortIPL4.grp" />
     <File_Group path="../Transport/EPTF_CLL_TransportMessageBufferManager.grp" />
     <File_Group path="../LGenBase/EPTF_CLL_LGenBase_External.grp" />
-    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />    
+    <File_Group name="XTDP" >
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+        <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+    </File_Group>
     <File_Group path="XTDPasp.grp" />
     <File_Group path="EPTF_CLL_UIHandler_Browser.grp" />
     <File_Group name="GeneralTypes" >
diff --git a/test/Common/CompileTest_AppLibs.prj b/test/Common/CompileTest_AppLibs.prj
index 5e8cf09..b8088ba 100644
--- a/test/Common/CompileTest_AppLibs.prj
+++ b/test/Common/CompileTest_AppLibs.prj
@@ -50,7 +50,15 @@
                         <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCMaths_GenericTypes.ttcn" />
                     </File_Group>
                     <File_Group name="TestPorts and ProtocolModules" >
-                        <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                        <File_Group name="IPL4" >
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                            <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                        </File_Group>
                         <File_Group name="LOADMEASasp" >
                             <File path="../../../../TestPorts/LOADMEASasp_CNL113585/src/LOADMEASasp_PT.cc" />
                             <File path="../../../../TestPorts/LOADMEASasp_CNL113585/src/LOADMEASasp_PT.hh" />
diff --git a/test/Common/CompileTest_all.prj b/test/Common/CompileTest_all.prj
index b3edb45..de0dc1d 100644
--- a/test/Common/CompileTest_all.prj
+++ b/test/Common/CompileTest_all.prj
@@ -207,7 +207,15 @@
                     </File_Group>
                     <File_Group name="TestPorts and ProtocolModules" >
                         <File_Groups>
-                            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                            <File_Group name="IPL4" >
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                            </File_Group>
                             <File_Group name="LOADMEASasp" >
                                 <File path="../../../../TestPorts/LOADMEASasp_CNL113585/src/LOADMEASasp_PT.cc" />
                                 <File path="../../../../TestPorts/LOADMEASasp_CNL113585/src/LOADMEASasp_PT.hh" />
@@ -242,7 +250,13 @@
                                 <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_EncDec.cc" />
                                 <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_Types.ttcn" />
                             </File_Group>
-                            <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+                            <File_Group name="XTDP" >
+                                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+                            </File_Group>
                             <File_Group name="HTTPmsg_CNL113312" >
                                 <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_MessageLen.ttcn"/>
                                 <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_MessageLen_Function.cc"/>
@@ -251,7 +265,10 @@
                                 <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_PortType.ttcn"/>
                                 <File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_Types.ttcn"/>
                             </File_Group>
-                            <File_Group path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.grp" />                  
+                            <File_Group name="AbstractSocket" >
+                                <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
+                                <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
+                            </File_Group>
                         </File_Groups>
                     </File_Group>
                     <File_Group name="Runtime_GUI_CNL113437" >
diff --git a/test/DataSource/EPTF_DataSource_Test.prj b/test/DataSource/EPTF_DataSource_Test.prj
index 256d7fe..f09cf26 100644
--- a/test/DataSource/EPTF_DataSource_Test.prj
+++ b/test/DataSource/EPTF_DataSource_Test.prj
@@ -53,7 +53,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface_Functions.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="LOADMEAS" >
                 <File path="../../../../TestPorts/LOADMEASasp_CNL113585/src/LOADMEASasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/LOADMEASasp_CNL113585/src/LOADMEASasp_PT.cc" />
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
index 9540a54..68bc952 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
@@ -59,10 +59,12 @@
                     </File_Group>
                 </File_Groups>
             </File_Group>
-            <File_Group name="ProtocolModules" >
-                <File_Groups>
-                    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-                </File_Groups>
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
             </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
@@ -96,7 +98,15 @@
             <File_Group path="../../src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp" />
             <File_Group path="../../src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp" />
             <File_Group path="../../src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4_asp" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="IPL4" >
                 <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_User_CtrlFunctDef.cc" />
             </File_Group>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
index c623b52..00410ce 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
@@ -64,10 +64,12 @@
                     </File_Group>
                 </File_Groups>
             </File_Group>
-            <File_Group name="ProtocolModules" >
-                <File_Groups>
-                    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-                </File_Groups>
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
             </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
@@ -103,7 +105,15 @@
             <File_Group path="../../src/StatManager/EPTF_CLL_StatManager_Dep.grp" />
             <File_Group path="../../src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp" />
             <File_Group path="../../src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="IPL4" >
                 <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_User_CtrlFunctDef.cc" />
             </File_Group>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
index a1f40a2..068d5bf 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
@@ -56,10 +56,12 @@
                     </File_Group>
                 </File_Groups>
             </File_Group>
-            <File_Group name="ProtocolModules" >
-                <File_Groups>
-                    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-                </File_Groups>
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
             </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
@@ -94,7 +96,15 @@
             <File_Group path="../../src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp" />
             <File_Group path="../../src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp" />
             <File_Group path="../../src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="IPL4" >
                 <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_User_CtrlFunctDef.cc" />
             </File_Group>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test.prj b/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
index ff33609..b167668 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
@@ -133,10 +133,12 @@
                     </File_Group>
                 </File_Groups>
             </File_Group>
-            <File_Group name="ProtocolModules" >
-                <File_Groups>
-                    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-                </File_Groups>
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
             </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
@@ -170,7 +172,15 @@
             <File_Group path="../../src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp" />
             <File_Group path="../../src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp" />
             <File_Group path="../../src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="IPL4" >
                 <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_User_CtrlFunctDef.cc" />
             </File_Group>
diff --git a/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj b/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj
index f0f53f8..3df1519 100644
--- a/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj
+++ b/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj
@@ -76,13 +76,24 @@
         		<File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_PortType.ttcn"/>
         		<File path="../../../../TestPorts/HTTPmsg_CNL113312/src/HTTPmsg_Types.ttcn"/>
 		    </File_Group>
-		    <File_Group path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.grp" />		    
+        <File_Group name="AbstractSocket" >
+            <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
+            <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
+        </File_Group>
                     <File_Group name="Telnet" >
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
                         <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
             <File_Group name="ProtocolModules" >
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test.prj b/test/HostAdmin/EPTF_HostAdmin_Test.prj
index ac09cc6..b44be16 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test.prj
+++ b/test/HostAdmin/EPTF_HostAdmin_Test.prj
@@ -43,7 +43,15 @@
     </Others>
     <File_Group name="MainFileGroup" >
         <File_Groups>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
 	    <File_Group path="../../src/Logging/EPTF_CLL_LoggingUI.grp" />
             <File_Group path="../../src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp" />
 	    <File_Group path="../../src/UIHandler/EPTF_CLL_UIHandler_Dep.grp" />
diff --git a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
index 816e287..8f2afe6 100644
--- a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
+++ b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
@@ -74,7 +74,13 @@
                   <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCSystem.cc" />
                   <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCSystem_Functions.ttcn" />
               </File_Group>
-              <File_Group path="./../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+              <File_Group name="XTDP" >
+                  <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                  <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                  <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                  <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                  <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+              </File_Group>
             </File_Group>
             <File_Group path="PerformanceTests/EPTF_LGenBase_PerformanceTest.grp" />
             <File_Group path="EPTF_LGenBase_Test.grp" />
diff --git a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
index b1a69c9..7f5e56a 100755
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
@@ -65,7 +65,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface_Functions.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="PIPEasp" >
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.cc" />
diff --git a/test/LoadRegulator/EPTF_LoadRegulator_Test.prj b/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
index 903a85e..1e189f6 100644
--- a/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
+++ b/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
@@ -79,13 +79,23 @@
                         <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.hh" />
                         <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_Types.ttcn" />
                     </File_Group>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                 </File_Groups>
             </File_Group>
-            <File_Group name="ProtocolModules" >
-                <File_Groups>
-                    <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-                </File_Groups>
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
             </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
diff --git a/test/Logging/EPTF_LoggingDSGUI_Test.prj b/test/Logging/EPTF_LoggingDSGUI_Test.prj
index 36abc35..7381e91 100644
--- a/test/Logging/EPTF_LoggingDSGUI_Test.prj
+++ b/test/Logging/EPTF_LoggingDSGUI_Test.prj
@@ -36,8 +36,18 @@
             </File_Group>
             <File_Group path="../../src/Logging/EPTF_CLL_LoggingCS_Dep.grp" />
             <File_Group path="../../src/UIHandler/EPTF_CLL_UIHandler_Base_Dep.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
-            <File_Group path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
+            <File_Group name="Socket_API" >
+                <File path="../../../../TestPorts/Common_Components/Socket_API_CNL113686/src/Socket_API_Definitions.ttcn" />
+            </File_Group>
             <File_Group name="GeneralTypes" >
                 <File path="../../../../ProtocolModules/COMMON/src/General_Types.ttcn" />
             </File_Group>   
diff --git a/test/Logging/EPTF_LoggingUI_Test_disabled.prj b/test/Logging/EPTF_LoggingUI_Test_disabled.prj
index aa86cfb..6645984 100644
--- a/test/Logging/EPTF_LoggingUI_Test_disabled.prj
+++ b/test/Logging/EPTF_LoggingUI_Test_disabled.prj
@@ -49,8 +49,22 @@
             <File_Group path="TCCUsefulFunctions.grp" />
             <File_Group path="TELNETasp.grp" />
             <File_Group path="../UIHandler/XTDPasp.grp" />
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
-            <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+            </File_Group>
             <File_Group path="../../src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp" />
         </File_Groups>
     </File_Group>
diff --git a/test/StatHandler/EPTF_StatHandler_Test.prj b/test/StatHandler/EPTF_StatHandler_Test.prj
index 8897971..2ed716a 100644
--- a/test/StatHandler/EPTF_StatHandler_Test.prj
+++ b/test/StatHandler/EPTF_StatHandler_Test.prj
@@ -80,7 +80,15 @@
                 <File path="EPTF_StatHandler_Test_Functions.ttcn" />
                 <File path="EPTF_StatHandler_Test_Testcases.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="TCCUseful" >
                 <File_Groups>
                     <File_Group name="Maths" >
@@ -90,7 +98,13 @@
                     </File_Group>
                 </File_Groups>
             </File_Group>
-            <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+            </File_Group>
         </File_Groups>
     </File_Group>
 </Project>
diff --git a/test/StatManager/EPTF_StatManager_Test.prj b/test/StatManager/EPTF_StatManager_Test.prj
index 896809c..7bf59a5 100644
--- a/test/StatManager/EPTF_StatManager_Test.prj
+++ b/test/StatManager/EPTF_StatManager_Test.prj
@@ -45,7 +45,15 @@
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group path="../../src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp" />
             <File_Group name="Useful" >
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCEncoding.cc" />
diff --git a/test/StatReplay/EPTF_StatReplay_Test.prj b/test/StatReplay/EPTF_StatReplay_Test.prj
index b4ba033..7767691 100644
--- a/test/StatReplay/EPTF_StatReplay_Test.prj
+++ b/test/StatReplay/EPTF_StatReplay_Test.prj
@@ -35,7 +35,15 @@
     </Test_Cases>
     <File_Group name="MainFileGroup" >
         <File_Groups>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="XSD" >
                 <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
                 <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
@@ -63,7 +71,13 @@
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.hh" />
             </File_Group>
-            <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+            </File_Group>
         </File_Groups>
     </File_Group>
 </Project>
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test.prj b/test/TimeProfileEditor/EPTF_TPE_Test.prj
index 09e8338..fdc8377 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test.prj
+++ b/test/TimeProfileEditor/EPTF_TPE_Test.prj
@@ -56,9 +56,13 @@
             <File_Group name="GeneralTypes" >
                 <File path="../../../../ProtocolModules/COMMON/src/General_Types.ttcn" />
             </File_Group>   
-            <File_Groups>
-                <File_Group path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_PM.grp" />
-            </File_Groups>    
+            <File_Group name="XTDP" >
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/XTDP_EncDecFunctions.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/UsefulTtcn3Types.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/../../COMMON/src/XSD.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdl.ttcn" />
+                <File path="../../../../ProtocolModules/XTDP_CNL113663/src/generated_files/ttcn_ericsson_se_protocolModules_xtdp_xtdp.ttcn" />
+            </File_Group>
             <File_Group name="AbstractSocket" >
                 <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
                 <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
@@ -81,7 +85,15 @@
                 <File path="EPTF_TPE_Test_Functions.ttcn" />
                 <File path="EPTF_TPE_Test_Templates.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
         </File_Groups>
     </File_Group>
 </Project>
diff --git a/test/Transport/EPTF_Transport_IPsecHandler_Test.prj b/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
index fc791e8..534bdd6 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
@@ -70,7 +70,15 @@
             </File_Group>
             <File_Group name="TestPorts, PMs" >
                 <File_Groups>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                     <File_Group name="IP_CNL113418" >
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_EncDec.cc" />
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_Types.ttcn" />
diff --git a/test/Transport/EPTF_Transport_NonBlocking_Test.prj b/test/Transport/EPTF_Transport_NonBlocking_Test.prj
index 6b7b5f5..11b2493 100644
--- a/test/Transport/EPTF_Transport_NonBlocking_Test.prj
+++ b/test/Transport/EPTF_Transport_NonBlocking_Test.prj
@@ -70,7 +70,15 @@
             </File_Group>
             <File_Group name="TestPorts, PMs" >
                 <File_Groups>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                     <File_Group name="IP_CNL113418" >
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_EncDec.cc" />
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_Types.ttcn" />
diff --git a/test/Transport/EPTF_Transport_PerfTest.prj b/test/Transport/EPTF_Transport_PerfTest.prj
index e73dc2c..5dbd7ca 100644
--- a/test/Transport/EPTF_Transport_PerfTest.prj
+++ b/test/Transport/EPTF_Transport_PerfTest.prj
@@ -72,7 +72,15 @@
             </File_Group>
             <File_Group name="TestPorts, PMs" >
                 <File_Groups>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                     <File_Group name="IP_CNL113418" >
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_EncDec.cc" />
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_Types.ttcn" />
diff --git a/test/Transport/EPTF_Transport_Test.prj b/test/Transport/EPTF_Transport_Test.prj
index 91d8081..994288a 100644
--- a/test/Transport/EPTF_Transport_Test.prj
+++ b/test/Transport/EPTF_Transport_Test.prj
@@ -70,7 +70,15 @@
             </File_Group>
             <File_Group name="TestPorts, PMs" >
                 <File_Groups>
-                    <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+                    <File_Group name="IPL4" >
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                        <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+                    </File_Group>
                     <File_Group name="IP_CNL113418" >
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_EncDec.cc" />
                         <File path="../../../../ProtocolModules/IP_CNL113418/src/IP_Types.ttcn" />
diff --git a/test/UIHandler/EPTF_UIHandler_Test.prj b/test/UIHandler/EPTF_UIHandler_Test.prj
index 62e4ad7..4a0fdf4 100644
--- a/test/UIHandler/EPTF_UIHandler_Test.prj
+++ b/test/UIHandler/EPTF_UIHandler_Test.prj
@@ -115,7 +115,10 @@
     </Others>
     <File_Group name="MainFileGroup" >
         <File_Groups>
-            <File_Group path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.grp" />
+            <File_Group name="AbstractSocket" >
+                <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
+                <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
+            </File_Group>
             <File_Group name="TelnetAsp" >
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
@@ -127,7 +130,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface_Functions.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="PIPEasp" >
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.cc" />
diff --git a/test/UIHandler/EPTF_UIHandler_Test2.prj b/test/UIHandler/EPTF_UIHandler_Test2.prj
index 0bc9069..57c27e8 100644
--- a/test/UIHandler/EPTF_UIHandler_Test2.prj
+++ b/test/UIHandler/EPTF_UIHandler_Test2.prj
@@ -123,7 +123,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface_Functions.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="PIPEasp" >
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.cc" />
diff --git a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
index c92deae..31abf14 100644
--- a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
+++ b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
@@ -55,7 +55,10 @@
     </Others>
     <File_Group name="MainFileGroup" >
         <File_Groups>
-            <File_Group path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.grp" />
+            <File_Group name="AbstractSocket" >
+                <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.cc" />
+                <File path="../../../../TestPorts/Common_Components/Abstract_Socket_CNL113384/src/Abstract_Socket.hh" />
+            </File_Group>
             <File_Group name="TelnetAsp" >
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/TELNETasp_CNL113320/src/TELNETasp_PT.cc" />
@@ -67,7 +70,15 @@
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface.cc" />
                 <File path="../../../TCCUsefulFunctions_CNL113472/src/TCCInterface_Functions.ttcn" />
             </File_Group>
-            <File_Group path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4.grp" />
+            <File_Group name="IPL4" >
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.cc" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PT.hh" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_PortType.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Types.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_Functions.ttcn" />
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_discovery.cc" />	
+                <File path="../../../../TestPorts/IPL4asp_CNL113531/src/IPL4asp_protocol_L234.hh" />				
+            </File_Group>
             <File_Group name="PIPEasp" >
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PortType.ttcn" />
                 <File path="../../../../TestPorts/PIPEasp_CNL113334/src/PIPEasp_PT.cc" />