TPD files mofified
diff --git a/MQTT_v3.1.1_CNL113831.tpd b/MQTT_v3.1.1_CNL113831.tpd
index 775831e..37886bd 100644
--- a/MQTT_v3.1.1_CNL113831.tpd
+++ b/MQTT_v3.1.1_CNL113831.tpd
@@ -2,36 +2,91 @@
 <!--
  Copyright (c) 2016-2017 Ericsson
 
-  The copyright to the computer  program(s) herein  is the property of Ericsson.
-  The program(s) may be used and/or copied only with the written permission
-  of Ericsson or in accordance with  the terms and conditions  stipulated in the
-  agreement/contract under which the program(s) has been supplied.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
 
-
+   Contributor:        Alexander Kaiser 
    File:               MQTT_v3.1.1_CNL113831.tpd
-   Description:        tpd project file
-   Rev:                R1A
+   Description:        tpd project file for negative testing
+   Rev:                R1F
    Prodnr:             CNL 113 831
 
  -->
 <TITAN_Project_File_Information version="1.0">
   <ProjectName>Mqtt_v3.1.1_CNL113831</ProjectName>
+  <ReferencedProjects>
+    <ReferencedProject name="Socket_API_CNL113686" projectLocationURI="../../TestPorts/Common_Components/Socket_API_CNL113686/Socket_API_CNL113686.tpd"/>
+  </ReferencedProjects>
   <Folders>
     <FolderResource projectRelativePath="src" relativeURI="src"/>
   </Folders>
-  <Files>
-    <FileResource projectRelativePath="src/Mqtt_v3.1.1_EncDec.cc" relativeURI="src/Mqtt_v3.1.1_EncDec.cc"/>
-    <FileResource projectRelativePath="src/Mqtt_v3.1.1_Types.ttcn" relativeURI="src/Mqtt_v3.1.1_Types.ttcn"/>
-  </Files>
-  <ActiveConfiguration>Default</ActiveConfiguration>
+  <ActiveConfiguration>NegativeTesting</ActiveConfiguration>
   <Configurations>
     <Configuration name="Default">
       <ProjectProperties>
         <MakefileSettings>
-          <generateInternalMakefile>true</generateInternalMakefile>
-          <GNUMake>true</GNUMake>
-          <incrementalDependencyRefresh>true</incrementalDependencyRefresh>
           <targetExecutable>bin/Mqtt_v3.1.1_CNL113831</targetExecutable>
+          <includeSourceInfo>true</includeSourceInfo>
+          <addSourceLineInfo>true</addSourceLineInfo>
+        </MakefileSettings>
+        <LocalBuildSettings>
+          <workingDirectory>bin</workingDirectory>
+        </LocalBuildSettings>
+      </ProjectProperties>
+    </Configuration>
+    <Configuration name="NegativeTesting">
+      <ProjectProperties>
+        <MakefileSettings>
+          <functiontestRuntime>true</functiontestRuntime>
+          <targetExecutable>bin/Mqtt_v3.1.1_CNL113831</targetExecutable>
+          <includeSourceInfo>true</includeSourceInfo>
+          <addSourceLineInfo>true</addSourceLineInfo>
+        </MakefileSettings>
+        <LocalBuildSettings>
+          <workingDirectory>bin</workingDirectory>
+        </LocalBuildSettings>
+      </ProjectProperties>
+      <FileProperties>
+        <FileResource>
+          <FilePath>src/MQTT_v3_1_1_EncDec.cc</FilePath>
+          <FileProperties>
+            <ExcludeFromBuild>true</ExcludeFromBuild>
+          </FileProperties>
+        </FileResource>
+        <FileResource>
+          <FilePath>src/MQTT_v3_1_1_IPL4SizeFunction.ttcn</FilePath>
+          <FileProperties>
+            <ExcludeFromBuild>true</ExcludeFromBuild>
+          </FileProperties>
+        </FileResource>
+        <FileResource>
+          <FilePath>src/MQTT_v3_1_1_Size.cc</FilePath>
+          <FileProperties>
+            <ExcludeFromBuild>true</ExcludeFromBuild>
+          </FileProperties>
+        </FileResource>
+        <FileResource>
+          <FilePath>src/MQTT_v3_1_1_Types.ttcn</FilePath>
+          <FileProperties>
+            <ExcludeFromBuild>true</ExcludeFromBuild>
+          </FileProperties>
+        </FileResource>
+        <FileResource>
+          <FilePath>src/negative_testing/README</FilePath>
+          <FileProperties>
+            <ExcludeFromBuild>true</ExcludeFromBuild>
+          </FileProperties>
+        </FileResource>
+      </FileProperties>
+    </Configuration>
+    <Configuration name="PositiveTesting">
+      <ProjectProperties>
+        <MakefileSettings>
+          <targetExecutable>bin/Mqtt_v3.1.1_CNL113831</targetExecutable>
+          <includeSourceInfo>true</includeSourceInfo>
+          <addSourceLineInfo>true</addSourceLineInfo>
         </MakefileSettings>
         <LocalBuildSettings>
           <workingDirectory>bin</workingDirectory>
@@ -39,7 +94,7 @@
       </ProjectProperties>
       <FolderProperties>
         <FolderResource>
-          <FolderPath>test</FolderPath>
+          <FolderPath>src/negative_testing</FolderPath>
           <FolderProperties>
             <ExcludeFromBuild>true</ExcludeFromBuild>
           </FolderProperties>
diff --git a/nt_MQTT_v3.1.1_CNL113831.tpd b/nt_MQTT_v3.1.1_CNL113831.tpd
deleted file mode 100644
index e8709a7..0000000
--- a/nt_MQTT_v3.1.1_CNL113831.tpd
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016-2017 Ericsson
-
-  The copyright to the computer  program(s) herein  is the property of Ericsson.
-  The program(s) may be used and/or copied only with the written permission
-  of Ericsson or in accordance with  the terms and conditions  stipulated in the
-  agreement/contract under which the program(s) has been supplied.
-
-   Contributor:        Alexander Kaiser 
-   File:               nt_MQTT_v3.1.1_CNL113831.tpd
-   Description:        tpd project file for negative testing
-   Rev:                R1A
-   Prodnr:             CNL 113 831
-
- -->
-<TITAN_Project_File_Information version="1.0">
-  <ProjectName>Mqtt_v3.1.1_CNL113831</ProjectName>
-  <ReferencedProjects>
-    <ReferencedProject name="Socket_API_CNL113686" projectLocationURI="../../TestPorts/Common_Components/Socket_API_CNL113686/Socket_API_CNL113686.tpd" tpdName="Socket_API_CNL113686.tpd"/>
-  </ReferencedProjects>
-  <Folders>
-    <FolderResource projectRelativePath="src" relativeURI="src"/>
-  </Folders>
-  <ActiveConfiguration>Default</ActiveConfiguration>
-  <Configurations>
-    <Configuration name="Default">
-      <ProjectProperties>
-        <MakefileSettings>
-          <functiontestRuntime>true</functiontestRuntime>
-          <generateInternalMakefile>true</generateInternalMakefile>
-          <GNUMake>true</GNUMake>
-          <incrementalDependencyRefresh>true</incrementalDependencyRefresh>
-          <targetExecutable>bin/Mqtt_v3.1.1_CNL113831</targetExecutable>
-          <includeSourceInfo>true</includeSourceInfo>
-          <addSourceLineInfo>true</addSourceLineInfo>
-        </MakefileSettings>
-        <LocalBuildSettings>
-          <workingDirectory>bin</workingDirectory>
-        </LocalBuildSettings>
-      </ProjectProperties>
-      <FileProperties>
-        <FileResource>
-          <FilePath>src/MQTT_v3_1_1_EncDec.cc</FilePath>
-          <FileProperties>
-            <ExcludeFromBuild>true</ExcludeFromBuild>
-          </FileProperties>
-        </FileResource>
-        <FileResource>
-          <FilePath>src/MQTT_v3_1_1_IPL4SizeFunction.ttcn</FilePath>
-          <FileProperties>
-            <ExcludeFromBuild>true</ExcludeFromBuild>
-          </FileProperties>
-        </FileResource>
-        <FileResource>
-          <FilePath>src/MQTT_v3_1_1_Size.cc</FilePath>
-          <FileProperties>
-            <ExcludeFromBuild>true</ExcludeFromBuild>
-          </FileProperties>
-        </FileResource>
-        <FileResource>
-          <FilePath>src/MQTT_v3_1_1_Types.ttcn</FilePath>
-          <FileProperties>
-            <ExcludeFromBuild>true</ExcludeFromBuild>
-          </FileProperties>
-        </FileResource>
-        <FileResource>
-          <FilePath>src/negative_testing/README</FilePath>
-          <FileProperties>
-            <ExcludeFromBuild>true</ExcludeFromBuild>
-          </FileProperties>
-        </FileResource>
-      </FileProperties>
-    </Configuration>
-  </Configurations>
-</TITAN_Project_File_Information>
diff --git a/pt_MQTT_v3.1.1_CNL113831.tpd b/pt_MQTT_v3.1.1_CNL113831.tpd
deleted file mode 100644
index acda328..0000000
--- a/pt_MQTT_v3.1.1_CNL113831.tpd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016-2017 Ericsson
-
-  The copyright to the computer  program(s) herein  is the property of Ericsson.
-  The program(s) may be used and/or copied only with the written permission
-  of Ericsson or in accordance with  the terms and conditions  stipulated in the
-  agreement/contract under which the program(s) has been supplied.
-
-   Contributor:        Alexander Kaiser 
-   File:               pt_MQTT_v3.1.1_CNL113831.tpd
-   Description:        tpd project file for positive testing
-   Rev:                R1A
-   Prodnr:             CNL 113 831
-
- -->
-<TITAN_Project_File_Information version="1.0">
-  <ProjectName>Mqtt_v3.1.1_CNL113831</ProjectName>
-  <ReferencedProjects>
-    <ReferencedProject name="Socket_API_CNL113686" projectLocationURI="../../TestPorts/Common_Components/Socket_API_CNL113686/Socket_API_CNL113686.tpd" tpdName="Socket_API_CNL113686.tpd"/>
-  </ReferencedProjects>
-  <Folders>
-    <FolderResource projectRelativePath="src" relativeURI="src"/>
-  </Folders>
-  <ActiveConfiguration>Default</ActiveConfiguration>
-  <Configurations>
-    <Configuration name="Default">
-      <ProjectProperties>
-        <MakefileSettings>
-          <generateInternalMakefile>true</generateInternalMakefile>
-          <GNUMake>true</GNUMake>
-          <incrementalDependencyRefresh>true</incrementalDependencyRefresh>
-          <targetExecutable>bin/Mqtt_v3.1.1_CNL113831</targetExecutable>
-          <includeSourceInfo>true</includeSourceInfo>
-          <addSourceLineInfo>true</addSourceLineInfo>
-        </MakefileSettings>
-        <LocalBuildSettings>
-          <workingDirectory>bin</workingDirectory>
-        </LocalBuildSettings>
-      </ProjectProperties>
-      <FolderProperties>
-        <FolderResource>
-          <FolderPath>src/negative_testing</FolderPath>
-          <FolderProperties>
-            <ExcludeFromBuild>true</ExcludeFromBuild>
-          </FolderProperties>
-        </FolderResource>
-      </FolderProperties>
-    </Configuration>
-  </Configurations>
-</TITAN_Project_File_Information>