diff --git a/demo/CentralScheduling/EPTF_CS_demo.prj b/demo/CentralScheduling/EPTF_CS_demo.prj
index ce53178fb36dfca0ecaf65b38384124be31e1110..c0225c26e20924538fae7227cd0e8e77ca4375e1 100644
--- a/demo/CentralScheduling/EPTF_CS_demo.prj
+++ b/demo/CentralScheduling/EPTF_CS_demo.prj
@@ -120,7 +120,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 688ce5b5486d8ca4f0f421c5e7664cc65b7d5032..2b993e7bf2e96d86f6343f97c0d8700fc20394b1 100644
--- a/demo/DataSource/EPTF_DataSource_Demo.prj
+++ b/demo/DataSource/EPTF_DataSource_Demo.prj
@@ -41,7 +41,13 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 b39d079a725942dfaa1d78990c993c39617469a4..95f30010ee27a620242ba4cb247183e3f73aa250 100644
--- a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
+++ b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
@@ -71,7 +71,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                         <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 7f6aadde34c04f0df0141cf7d62243c0d294b8a4..041afdcd24844c6ddf326b8809ffb5cbbf0c5906 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 dab761089c75a645d9811ee0eec35925448c0a66..82add4410937a72fd4462a4fbf782bc8885f1dd1 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 e86253b856e2f39c45a5e00aa0954421ea0f462c..5bc470b988a414cada25e0de6daf3c95815a92ce 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 1ff892151a3ec01efc4bffc2e152e4f958ae7290..5e9a3e7b1a2fabfcae38457113afe77ad6572f9b 100644
--- a/demo/HostAdmin/EPTF_HostAdmin_demo.prj
+++ b/demo/HostAdmin/EPTF_HostAdmin_demo.prj
@@ -55,7 +55,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 c13dbde1a45a7507832a435d7e6c23876d86480e..4f43808c3b095e3d9eb78cfa9cc6ab8e76727383 100644
--- a/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
+++ b/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
@@ -61,7 +61,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                         <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 a4fa0643f807c94660075b0d367f8ac18e581b5e..0a72e72a15b489c3a1f36f0c974012e9637195cc 100644
--- a/demo/Logging/LoggingUI.prj
+++ b/demo/Logging/LoggingUI.prj
@@ -46,7 +46,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 a028c26301ea17f468d15bed3477956a50a67a36..c0f3bffecc5de55ac075eb01776d6abece4fb3c5 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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 3e13828d2dd164ccfcc70cd4e7e845c85ec1d277..671fd8bbea17fcc3069135c2143ac6d40e50fb95 100644
--- a/demo/StatHandler/EPTF_StatHandler_Demo.prj
+++ b/demo/StatHandler/EPTF_StatHandler_Demo.prj
@@ -50,7 +50,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 ce3bf46423e5394d0964e1a7596a30ec9f44561c..a300c0ffcfc0e5dba3e4b0408204874ff54ed49e 100644
--- a/demo/StatManager/EPTF_StatManager_demo.prj
+++ b/demo/StatManager/EPTF_StatManager_demo.prj
@@ -59,13 +59,23 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 a489b9d8a39d7208413d4871bdff5925b8a09af1..ee776327caba9092bba131c83425e4e191318410 100644
--- a/demo/StatReplay/StatReplay_Demo.prj
+++ b/demo/StatReplay/StatReplay_Demo.prj
@@ -83,7 +83,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 40f431e9c499b0def0a2d4ce82b7c8fd3ac2179c..4d3a4f32cbbf08f922c397c86515d611dbbd636f 100644
--- a/demo/TimeProfileEditor/TimeProfileEditor.prj
+++ b/demo/TimeProfileEditor/TimeProfileEditor.prj
@@ -47,11 +47,13 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 fd837b7570be5ff3f7c44a636019480e365aa1c7..1c211b4114537e5a3b6ab589f8b8a9499701a974 100755
--- a/demo/Transport/Transport_Demo.prj
+++ b/demo/Transport/Transport_Demo.prj
@@ -46,8 +46,18 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 28ce954dd47d30d55da1332e333bf650cec203ae..8fb72623d88064388c8685d087481fea8113cf64 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 ee30c40834bd72b4263777fe26bd7a29a60997e5..ce248a99c7cd1aea26de71609d67469d1d0735df 100644
--- a/demo/UIHandler/UI_Handler_Test.prj
+++ b/demo/UIHandler/UI_Handler_Test.prj
@@ -93,7 +93,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 c74c786b837b1b66c9ffd8fc1ceb9e9dab379a0d..db15833c090631b0bfd41a481d9dcf0d4b310b98 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 12c61653dad9a7068ffdfc688a4496314aaeaf6d..7d5a78e4590483a6fde781c10b17e2b78937dfdd 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 d62b6438378f6d9fb613e6bc0fe5859874b03336..466d5cb2961e3d08d95d0de0db1016967abb2e25 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 e90c0b33fd02fdaba6f596428659830863dac349..2f87899f1d12fbf935cf4d3df21e3ea29f2c8628 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 c837ad1374fe0e8507c64695bc2968dead99fea4..25b522ebebbb4b8a8192425539b3645862bf6b50 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 84275c021dd68f1fb8243c61cb44bdb44a0b8a7d..b26d8335b34dd1ae230aa18906a7fac4b5eab248 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 d1e1780e1f0490f57e33e2715614b7bd5b59dcbf..0c29e986aa0cbb4f72488dcb515309e7be08c30c 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 855d08b8e6629ec20bad687258f7726f18bd9b71..a25a98b86b4b2c21af2fab5c0bff0a158fdd088d 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 cf3fe8922c45cf9728c491f4d2833a203e2952ad..2c38dbbb8527233f3fac053673951f8846fcac85 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 5e8cf09c1dc45e2406b3aa613578948affc9ce9d..b8088bae2a3f3812c77e7fb50abf373bdcca9317 100644
--- a/test/Common/CompileTest_AppLibs.prj
+++ b/test/Common/CompileTest_AppLibs.prj
@@ -50,7 +50,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                         <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 b3edb456f0b23d1d226450725cbdd230a0620d7a..de0dc1d26601f6d3eeaf9e0599f4dde730613ffe 100644
--- a/test/Common/CompileTest_all.prj
+++ b/test/Common/CompileTest_all.prj
@@ -207,7 +207,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                                 <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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                                 <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 256d7fee45be09949f0d3e399fabe5b63d65639c..f09cf26abd0a02971841d2fa24b9583ef2092519 100644
--- a/test/DataSource/EPTF_DataSource_Test.prj
+++ b/test/DataSource/EPTF_DataSource_Test.prj
@@ -53,7 +53,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 9540a54f41027d4126e167cf76b28244cb8533e9..68bc9521e86ae5b9359591e54a37293292b63416 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
@@ -59,10 +59,12 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 c623b52548926e0dbadc8088e413f969a70a5eae..00410ced456f45f156719fbca966b649280aa162 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
@@ -64,10 +64,12 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 a1f40a2dd04d444587bcf42d7d87942fc59471b3..068d5bf44b8879a26a76f6fc10a7cddb98b2c9f7 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
@@ -56,10 +56,12 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 ff3360916bba01d5c2d18c62ea95677ba195746e..b167668c406b0916e7cf55049c14cacd28285903 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
@@ -133,10 +133,12 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 f0f53f8a0bb4e0cfc6a7ff3b5a37037513c0e06b..3df1519e25c68fc3c7bf29219cce3d974800cf95 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 ac09cc60ba7d6dc16c309c978a6a1fabfb835324..b44be163fe35e410cea98e2cd49072f89e023565 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test.prj
+++ b/test/HostAdmin/EPTF_HostAdmin_Test.prj
@@ -43,7 +43,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
     </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 816e2876944cc198c1259cf98ce1b32c14e65285..8f2afe60efdc00892c2a8f5f3b2a7c90c775b68d 100644
--- a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
+++ b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
@@ -74,7 +74,13 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                   <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 b1a69c9272a53cc818debb10adff6bc17009ccee..7f5e56a4c752bc194d2b8a9b1a08153282cb5781 100755
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
@@ -65,7 +65,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 903a85e2c4048788647dfb8ffba4f8cb8dc6e679..1e189f64c953216b29919d173f06951a64b39cfd 100644
--- a/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
+++ b/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
@@ -79,13 +79,23 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                         <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 36abc352423a14d83592717d87eb1db9f85b4a62..7381e91f542783771db51eff7359a0f87dcd6f31 100644
--- a/test/Logging/EPTF_LoggingDSGUI_Test.prj
+++ b/test/Logging/EPTF_LoggingDSGUI_Test.prj
@@ -36,8 +36,18 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             </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 aa86cfb251d2e6feb4f212bceb4b60026ea216cd..66459849cf37c7b0f8f825f7142b237d5a6823fd 100644
--- a/test/Logging/EPTF_LoggingUI_Test_disabled.prj
+++ b/test/Logging/EPTF_LoggingUI_Test_disabled.prj
@@ -49,8 +49,22 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 88979718849fb4247eaf316111c0b1fd49e6eb58..2ed716a3ae0bfacc2035933c72402f5de7299993 100644
--- a/test/StatHandler/EPTF_StatHandler_Test.prj
+++ b/test/StatHandler/EPTF_StatHandler_Test.prj
@@ -80,7 +80,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                     </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 896809cdd4712a637b5bb124749d6efc77526c3c..7bf59a54f45edad51f0f77de7321a3eea9c21e5f 100644
--- a/test/StatManager/EPTF_StatManager_Test.prj
+++ b/test/StatManager/EPTF_StatManager_Test.prj
@@ -45,7 +45,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 b4ba0339560e419e8ffbd9348bbbee26065f3a37..77676913ec4d48f5377c1c8bf5965d007c3824da 100644
--- a/test/StatReplay/EPTF_StatReplay_Test.prj
+++ b/test/StatReplay/EPTF_StatReplay_Test.prj
@@ -35,7 +35,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 09e8338ffe13a830873bc7ce3f48a7b842c18a6a..fdc8377a493211bc8a6ab27141e676eeb86aad47 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test.prj
+++ b/test/TimeProfileEditor/EPTF_TPE_Test.prj
@@ -56,9 +56,13 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             <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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 fc791e8dbe0afe76b655ca0a519cefec7874e7dd..534bdd65630dbcf83e69dab637d374dc8f854d99 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
@@ -70,7 +70,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             </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 6b7b5f5871f34a690751b0fb5665a28cd8d01a95..11b24936aef4be70155225797cef6a4593d6bc37 100644
--- a/test/Transport/EPTF_Transport_NonBlocking_Test.prj
+++ b/test/Transport/EPTF_Transport_NonBlocking_Test.prj
@@ -70,7 +70,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             </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 e73dc2c89fa36cd2dcdb8e2569b689378532d583..5dbd7ca85c4636ba2d0770693aaeb3aad1edafa4 100644
--- a/test/Transport/EPTF_Transport_PerfTest.prj
+++ b/test/Transport/EPTF_Transport_PerfTest.prj
@@ -72,7 +72,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             </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 91d80815ead5ceaf8189ef9ec28143601948a9f9..994288aa88808cc37a633657942905460a5df0fc 100644
--- a/test/Transport/EPTF_Transport_Test.prj
+++ b/test/Transport/EPTF_Transport_Test.prj
@@ -70,7 +70,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
             </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 62e4ad7750b86badd75345180faf56eed82f0f88..4a0fdf4d59e04f554a362d7e7cc31b31e7fc7892 100644
--- a/test/UIHandler/EPTF_UIHandler_Test.prj
+++ b/test/UIHandler/EPTF_UIHandler_Test.prj
@@ -115,7 +115,10 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 0bc90699d8738e8c58d913b8375c0303edf463e3..57c27e8e6c6cfc48adfb35429182c890563fdc7e 100644
--- a/test/UIHandler/EPTF_UIHandler_Test2.prj
+++ b/test/UIHandler/EPTF_UIHandler_Test2.prj
@@ -123,7 +123,15 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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 c92deae1dcad31b0d66d8d800543624234585da2..31abf14e3601bfba59b94f77b50fa56fd249f1aa 100644
--- a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
+++ b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
@@ -55,7 +55,10 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
     </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 @@ http:www.eclipse.org/legal/epl-v10.html                           -->
                 <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" />