diff --git a/ttcn/CAM/LibITS_Functions_CAM.ttcn b/ttcn/CAM/LibITS_Functions_CAM.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..5bc63f83ea38f9b28e63252ff77af4e4435a68e3
--- /dev/null
+++ b/ttcn/CAM/LibITS_Functions_CAM.ttcn
@@ -0,0 +1,12 @@
+/**
+ *	@author 	ETSI / STF405
+ *  @version 	$URL: $
+ *				$Id: $
+ *	@desc		Module containing functions for CAM
+ *
+ */
+module LibITS_Functions_CAM {
+    
+        
+    
+} // end LibITS_Functions_CAM
\ No newline at end of file
diff --git a/ttcn/CAM/LibITS_Templates_CAM.ttcn b/ttcn/CAM/LibITS_Templates_CAM.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..9e0c504c5257af33b665049412a0711eeefd7f7d
--- /dev/null
+++ b/ttcn/CAM/LibITS_Templates_CAM.ttcn
@@ -0,0 +1,12 @@
+/**
+ *	@author 	ETSI / STF405
+ *  @version 	$URL: $
+ *				$Id: $
+ *	@desc		Module containing base template definitions for CAM
+ *
+ */
+module LibITS_Templates_CAM {
+    
+        
+    
+} // end LibITS_Templates_CAM
\ No newline at end of file
diff --git a/ttcn/DENM/LibITS_Functions_DENM.ttcn b/ttcn/DENM/LibITS_Functions_DENM.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..be71af755aec3249d36850b1e5ac2abdda941c1c
--- /dev/null
+++ b/ttcn/DENM/LibITS_Functions_DENM.ttcn
@@ -0,0 +1,12 @@
+/**
+ *	@author 	ETSI / STF405
+ *  @version 	$URL: $
+ *				$Id: $
+ *	@desc		Module containing functions for DENM
+ *
+ */
+module LibITS_Functions_DENM {
+    
+        
+    
+} // end LibITS_Functions_DENM
\ No newline at end of file
diff --git a/ttcn/DENM/LibITS_Templates_DENM.ttcn b/ttcn/DENM/LibITS_Templates_DENM.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..3b94d65efb56c60ea51a13527307f6e41478f008
--- /dev/null
+++ b/ttcn/DENM/LibITS_Templates_DENM.ttcn
@@ -0,0 +1,12 @@
+/**
+ *	@author 	ETSI / STF405
+ *  @version 	$URL: $
+ *				$Id: $
+ *	@desc		Module containing base template definitions for DENM
+ *
+ */
+module LibITS_Templates_DENM {
+    
+        
+    
+} // end LibITS_Templates_DENM
\ No newline at end of file
diff --git a/ttcn/ITS_TestSystem.ttcn b/ttcn/ITS_TestSystem.ttcn
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/ttcn/LibITS_Interface.ttcn b/ttcn/LibITS_Interface.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..5967240b04dfb503c93c4c9fea51d11ac0f1313a
--- /dev/null
+++ b/ttcn/LibITS_Interface.ttcn
@@ -0,0 +1,187 @@
+/**
+ *	@author 	ETSI / STF405
+ *  @version 	$URL: $
+ *				$Id: $
+ *	@desc		Module containing PTCs and interface ports definitions for ITS
+ *
+ */
+module LibITS_Interface {
+    
+    group interfaceComponents {
+        
+        /**
+         * @desc Test component for ITS Access layer 
+         */
+        type component PtcAC {
+            
+            // AC1 ports
+            port MacM5Port macM5Port;
+            
+            // AC2 ports
+            port MacIRPort macIRPort;
+        }
+
+        /**
+         * @desc Test component for ITS Facility layer 
+         */
+        type component PtcFA {
+            
+            // FA1 ports
+            port CAMPort camPort;
+            port DENMPort denmPort;
+            
+            // FA2 ports
+            port CooperPort cooperPort;
+        }
+
+        /**
+         * @desc Test component for ITS Management layer 
+         */
+        type component PtcMGT {
+            
+            // MGT1 ports
+            port IISCPort iiscPort;
+        }
+
+        /**
+         * @desc Test component for ITS Network and Transport layer 
+         */
+        type component PtcNT {
+            
+            // NT1 ports 
+            port BTPPort btpPort;
+            
+            // NT2 ports
+            port GeoNetPort geoNetPort;
+            port GeoNetOverIPv6Port geoNetOverIPv6Port;
+            
+            // NT3 ports
+            port FastPort fastPort;
+        }
+        
+    } // end interfaceComponents
+    
+    group interfacePorts {    
+    
+    	group AccessPorts {
+		
+			group AC1Ports {
+
+				/**
+				 * @desc AC1 Mac M5 Port (MacM5/PhyM5) 
+				 */
+				type port MacM5Port message {
+				    
+				} // end MacM5Port
+			    
+			} // end AC1Ports
+
+			group AC2Ports {
+			    
+			    /**
+				 * @desc AC2 Mac IR Port (MacIR/PhyIR) 
+				 */
+				type port MacIRPort message {
+				    
+				} // end MacIRPort
+			    
+			} // end AC2Ports
+    	    
+    	} // end AccessPorts
+
+    	group FacilityPorts {
+    	    
+    	    group FA1Ports {
+	
+				/**
+				 * @desc FA1 CAM Port (CAM/BTP/GeoNet/G5) 
+				 */
+				type port CAMPort message {
+				    
+				} // end CAMPort
+
+				/**
+				 * @desc FA1 DENM Port (DENM/BTP/GeoNet/G5) 
+				 */
+				type port DENMPort message {
+				    
+				} // end DENMPort
+						    
+			} // end FA1Ports
+
+    	    group FA2Ports {
+			    
+				/**
+				 * @desc FA2 Cooper Port (Cooper/Fast/M5-IR) 
+				 */
+				type port CooperPort message {
+				    
+				} // end CooperPort			    
+			    
+			} // end FA2Ports
+    	    
+    	} // end FacilityPorts
+	
+    	group ManagementPorts {
+    	    
+    	    group MGT1Ports {
+			    
+			    /**
+				 * @desc MGT1 IISC Port (IISC/LAN) 
+				 */
+				type port IISCPort message {
+				    
+				} // end IISCPort
+				
+			} // end MGT1Ports
+    	    
+    	} // end ManagementPorts    	
+
+    	group NetworkAndTransportPorts {
+    	    
+    	    group NT1Ports {
+
+				/**
+				 * @desc NT1 BTP Port (BTP/GeoNet/G5) 
+				 */
+				type port BTPPort message {
+				    
+				} // end BTPPort
+							    
+			} // end NT1Ports
+			
+			group NT2Ports {
+
+				/**
+				 * @desc NT2 GeoNetworking Port (GeoNet/G5) 
+				 */
+				type port GeoNetPort message {
+				    
+				} // end GeoNetPort
+
+				/**
+				 * @desc NT2 GeoNetworking over IPv6 Port (GeoNet/IPv6/G5) 
+				 */
+				type port GeoNetOverIPv6Port message {
+				    
+				} // end GeoNetOverIPv6Port
+
+			    
+			} // end NT2Ports
+			
+			group NT3Ports {
+
+				/**
+				 * @desc NT3 Fast Port (Fast/M5-IR) 
+				 */
+				type port FastPort message {
+				    
+				} // end FastPort
+			    
+			} // end NT3Ports
+    	    
+    	} // end NetworkAndTransportPorts
+    
+    } // end interfacePorts
+    
+} // end LibITS_Interface
diff --git a/ttcn/LibITS_TestSystem.ttcn b/ttcn/LibITS_TestSystem.ttcn
new file mode 100644
index 0000000000000000000000000000000000000000..77e299188ed34aa3aad3c347346e033e6c75af17
--- /dev/null
+++ b/ttcn/LibITS_TestSystem.ttcn
@@ -0,0 +1,52 @@
+/**
+ *	@author 	ETSI / STF405
+ *  @version 	$URL: $
+ *				$Id: $
+ *	@desc		Test System module for ITS
+ *
+ */
+module LibITS_TestSystem {
+    
+    group portDefinitions {
+    
+    	/**
+    	 * @desc Upper Tester port
+    	 */
+    	type port UpperTesterPort message {
+    	    
+    	} // end UpperTesterPort
+    	
+    	/**
+    	 * @desc Adapter control port
+    	 */
+    	type port AdapterControlPort message {
+    	    
+    	} // end AdapterControlPort
+
+    } // end portDefinitions
+
+	group componentDefinitions {
+
+    	/**
+    	 * @desc ITS Main Test Component 
+    	 */
+    	type component ItsMtc {
+    	    
+    	    port UpperTesterPort utPort;
+            port AdapterControlPort acPort;
+            
+    	} // end ItsMtc
+    
+    	/**
+    	 * @desc ITS System Adaper 
+    	 */
+        type component ItsAdapter {
+            
+            port UpperTesterPort utPort;
+            port AdapterControlPort acPort;
+            
+        } // end ItsAdapter    
+        
+	} // end componentDefinitions
+	 
+} // end LibITS_TestSystem
\ No newline at end of file