diff --git a/Jenkinsfile.win b/Jenkinsfile.win
index cf8eab54a..3d5ec68e1 100644
--- a/Jenkinsfile.win
+++ b/Jenkinsfile.win
@@ -24,19 +24,14 @@ pipeline {
     stages {
         stage('Build'){
             steps {
-                bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} build"
+                bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME}  -buildfile build_IS.xml build"
             }
         }
         stage('Deploy') {
             steps {
-		bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} deploy"
-            }
-        }
- 	stage('Test') {
-            steps {
-		bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} test"
-		junit 'report/'
+		bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} -buildfile build_IS.xml deploy"
             }
         }
+ 	
     }
 }
diff --git a/Jenkinsfile_BPM.win b/Jenkinsfile_BPM.win
new file mode 100644
index 000000000..e9fc444a8
--- /dev/null
+++ b/Jenkinsfile_BPM.win
@@ -0,0 +1,37 @@
+/*
+* Copyright © 2010 - 2013 Apama Ltd.
+* Copyright © 2013 - 2018 Software AG, Darmstadt, Germany and/or its licensors
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+*   Licensed under the Apache License, Version 2.0 (the "License");
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the License at
+*
+*       http://www.apache.org/licenses/LICENSE-2.0
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.                                                            
+*
+*/
+
+pipeline {
+    agent any 
+
+    stages {
+        stage('Build'){
+            steps {
+                bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME}  -buildfile build_BPM.xml build"
+            }
+        }
+        stage('Deploy') {
+            steps {
+		bat "${env.SAG_HOME}/common/lib/ant/bin/ant -DSAGHome=${env.SAG_HOME} -DSAG_CI_HOME=${env.SAG_CI_HOME} -DprojectName=${env.JOB_NAME} -buildfile build_BPM.xml deploy"
+            }
+        }
+ 	
+    }
+}
diff --git a/assets/BPM/.project b/assets/BPM/.project
new file mode 100644
index 000000000..b8e69d682
--- /dev/null
+++ b/assets/BPM/.project
@@ -0,0 +1,13 @@
+
+
+	TestProject
+	
+	
+	
+	
+	
+	
+		processNature
+		com.webmethods.sc.solutions.ui.processnature
+	
+
diff --git a/assets/BPM/TestProcess.config b/assets/BPM/TestProcess.config
new file mode 100644
index 000000000..23f26b3cd
--- /dev/null
+++ b/assets/BPM/TestProcess.config
@@ -0,0 +1,11 @@
+
+
+  
+  
+  
+  
+
diff --git a/assets/BPM/TestProcess.process b/assets/BPM/TestProcess.process
new file mode 100644
index 000000000..c912e5478
--- /dev/null
+++ b/assets/BPM/TestProcess.process
@@ -0,0 +1,100 @@
+
+
+  
+  
+    
+    
+    
+  
+  
+  
+  
+  
+    
+    
+    
+    
+      
+      
+      
+        
+      
+      
+      
+    
+    
+    
+    
+      
+    
+  
+  
+    
+    
+    
+    
+      
+      
+      
+    
+    
+    
+  
+  
+
diff --git a/assets/BPM/build.xml b/assets/BPM/build.xml
new file mode 100644
index 000000000..ba3753572
--- /dev/null
+++ b/assets/BPM/build.xml
@@ -0,0 +1,132 @@
+
+
+
+
+	
+	
+	
+	
+	
+	
+
+
+	
+	
+	
+	
+	
+	
+	
+
+	
+	
+		
+		
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+		
+		
+		
+		
+			
+				
+				
+				
+			
+		
+		
+			
+			
+				
+			
+		
+		
+			
+			
+				
+			
+			
+				
+			
+		
+
+	
+
+
+	
+		
+			
+			
+				
+					
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+
+					
+						
+						
+					
+
+				
+			
+		
+		
+			
+			
+				
+			
+			
+				
+           
+			     
+				    
+			     
+			     
+            
+           
+           
+			
+      
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+		
+		
+	
+
+
\ No newline at end of file
diff --git a/assets/IS/Packages/Fibonachi/manifest.bak b/assets/IS/Packages/Fibonachi/manifest.bak
index c62aa628f..aab4f72d7 100644
--- a/assets/IS/Packages/Fibonachi/manifest.bak
+++ b/assets/IS/Packages/Fibonachi/manifest.bak
@@ -3,11 +3,11 @@
 
   yes
   no
-  1.0
+  2.0
   
   
   
   
-  
+  Default
   yes
 
diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/flow.xml
similarity index 91%
rename from assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml
rename to assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/flow.xml
index eb56ac20a..dce9d9b63 100644
--- a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml
+++ b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/flow.xml
@@ -1,14 +1,5 @@
 
 
-
-
 
   
 
@@ -70,25 +61,6 @@
         false
         false
       
-      
-        record
-        unknown
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -233,25 +205,6 @@
         false
         false
       
-      
-        record
-        unknown
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -320,7 +273,7 @@
     false
     
       
-        unknown
+        field
         unknown
         false
         preserve
@@ -461,25 +414,6 @@
         false
         false
       
-      
-        record
-        unknown
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -656,7 +590,7 @@
     false
     
       
-        unknown
+        field
         unknown
         false
         preserve
@@ -797,25 +731,6 @@
         false
         false
       
-      
-        record
-        unknown
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -879,7 +794,6 @@
     subtractIntsInput
     record
     0
-    IData
     true
     false
     false
@@ -920,7 +834,6 @@
     false
     record
     0
-    IData
     true
     false
     false
@@ -1019,7 +932,6 @@
     false
     record
     0
-    IData
     true
     false
     false
@@ -1124,7 +1036,6 @@
     subtractIntsOutput
     record
     0
-    IData
     true
     false
     false
@@ -1188,7 +1099,7 @@
     false
     
       
-        unknown
+        field
         unknown
         false
         num1
@@ -1199,7 +1110,7 @@
         false
       
       
-        unknown
+        field
         unknown
         false
         num2
@@ -1394,7 +1305,7 @@
         false
       
       
-        unknown
+        field
         unknown
         false
         value
@@ -1424,7 +1335,7 @@
     false
     
       
-        unknown
+        field
         unknown
         false
         value
@@ -1468,28 +1379,6 @@
     false
     false
     
-      
-        unknown
-        unknown
-        false
-        num1
-        string
-        0
-        true
-        false
-        false
-      
-      
-        unknown
-        unknown
-        false
-        num2
-        string
-        0
-        true
-        false
-        false
-      
       
         record
         unknown
@@ -1543,7 +1432,7 @@
         false
       
       
-        unknown
+        field
         unknown
         false
         value
@@ -1624,7 +1513,7 @@
         false
       
       
-        unknown
+        field
         unknown
         false
         value
@@ -1677,7 +1566,6 @@
     clearPipelineInput
     record
     0
-    IData
     true
     false
     false
@@ -1709,7 +1597,6 @@
     false
     record
     0
-    IData
     true
     false
     false
diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml.bak b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/flow.xml.bak
similarity index 89%
rename from assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml.bak
rename to assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/flow.xml.bak
index 1425a0029..d622d1608 100644
--- a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/flow.xml.bak
+++ b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/flow.xml.bak
@@ -12,6 +12,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -21,6 +22,7 @@
     
       
         record
+        unknown
         
         
           true
@@ -39,6 +41,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -49,6 +52,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -57,24 +61,6 @@
         false
         false
       
-      
-        record
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -85,6 +71,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -100,13 +87,14 @@
 
   
 
-
+
   
 
 
   1
   
     record
+    unknown
     false
     numTwo
     string
@@ -119,13 +107,14 @@
 
 
 
-
+
   
 
 
   0
   
     unknown
+    unknown
     false
     numOne
     string
@@ -156,6 +145,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -165,6 +155,7 @@
     
       
         record
+        unknown
         
         
           true
@@ -183,6 +174,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -193,6 +185,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -203,6 +196,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -211,24 +205,6 @@
         false
         false
       
-      
-        record
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -239,6 +215,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -254,13 +231,14 @@
 
   
 
-
+
   
 
 
   0
   
     unknown
+    unknown
     false
     fibonachiNumber
     string
@@ -285,6 +263,7 @@
 
   
     record
+    unknown
     false
     clearPipelineInput
     record
@@ -294,7 +273,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         preserve
         string
@@ -315,6 +295,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -330,7 +311,7 @@
 
   
 
-
+
   
 
 
@@ -339,6 +320,7 @@
   
   
     unknown
+    unknown
     false
     preserve
     string
@@ -360,6 +342,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -369,6 +352,7 @@
     
       
         unknown
+        unknown
         false
         preserve
         string
@@ -380,6 +364,7 @@
       
       
         record
+        unknown
         
         
           true
@@ -398,6 +383,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -408,6 +394,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -418,6 +405,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -426,24 +414,6 @@
         false
         false
       
-      
-        record
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -454,6 +424,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -491,6 +462,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -500,6 +472,7 @@
     
       
         record
+        unknown
         
         
           true
@@ -518,6 +491,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -528,6 +502,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -538,6 +513,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -556,6 +532,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -571,13 +548,14 @@
 
   
 
-
+
   
 
 
   1
   
     unknown
+    unknown
     false
     fibonachiNumber
     string
@@ -602,6 +580,7 @@
 
   
     record
+    unknown
     false
     clearPipelineInput
     record
@@ -611,7 +590,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         preserve
         string
@@ -632,6 +612,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -647,7 +628,7 @@
 
   
 
-
+
   
 
 
@@ -656,6 +637,7 @@
   
   
     unknown
+    unknown
     false
     preserve
     string
@@ -677,6 +659,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -686,6 +669,7 @@
     
       
         unknown
+        unknown
         false
         preserve
         string
@@ -697,6 +681,7 @@
       
       
         record
+        unknown
         
         
           true
@@ -715,6 +700,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -725,6 +711,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -735,6 +722,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -743,24 +731,6 @@
         false
         false
       
-      
-        record
-        
-        
-          true
-          false
-          false
-        
-        false
-        Untitled
-        string
-        0
-        
-        
-        true
-        false
-        false
-      
     
     true
   
@@ -771,6 +741,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -818,6 +789,7 @@
 
   
     record
+    unknown
     false
     subtractIntsInput
     record
@@ -827,7 +799,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         num1
         string
@@ -837,7 +810,8 @@
         false
       
       
-        unknown
+        field
+        unknown
         false
         num2
         string
@@ -856,6 +830,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -865,6 +840,7 @@
     
       
         record
+        unknown
         
         
           true
@@ -883,6 +859,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -893,6 +870,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -903,6 +881,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -922,13 +901,14 @@
 
 
 
-
+
   
 
 
   2
   
     unknown
+    unknown
     false
     num2
     string
@@ -948,6 +928,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -957,6 +938,7 @@
     
       
         unknown
+        unknown
         false
         num1
         string
@@ -967,6 +949,7 @@
       
       
         unknown
+        unknown
         false
         num2
         string
@@ -977,6 +960,7 @@
       
       
         record
+        unknown
         
         
           true
@@ -995,6 +979,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -1005,6 +990,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -1015,6 +1001,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -1024,7 +1011,8 @@
         false
       
       
-        unknown
+        field
+        unknown
         false
         value
         string
@@ -1043,6 +1031,7 @@
 
   
     record
+    unknown
     false
     subtractIntsOutput
     record
@@ -1052,7 +1041,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         value
         string
@@ -1099,6 +1089,7 @@
 
   
     record
+    unknown
     false
     addIntsInput
     record
@@ -1108,7 +1099,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         num1
         string
@@ -1118,7 +1110,8 @@
         false
       
       
-        unknown
+        field
+        unknown
         false
         num2
         string
@@ -1137,6 +1130,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -1146,6 +1140,7 @@
     
       
         record
+        unknown
         
         
           true
@@ -1164,6 +1159,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -1174,6 +1170,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -1184,6 +1181,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -1194,6 +1192,7 @@
       
       
         unknown
+        unknown
         false
         $retries
         string
@@ -1223,6 +1222,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -1232,6 +1232,7 @@
     
       
         unknown
+        unknown
         false
         num1
         string
@@ -1242,6 +1243,7 @@
       
       
         unknown
+        unknown
         false
         num2
         string
@@ -1252,6 +1254,7 @@
       
       
         record
+        unknown
         
         
           true
@@ -1270,6 +1273,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -1280,6 +1284,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -1290,6 +1295,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -1299,7 +1305,8 @@
         false
       
       
-        unknown
+        field
+        unknown
         false
         value
         string
@@ -1318,6 +1325,7 @@
 
   
     record
+    unknown
     false
     addIntsOutput
     record
@@ -1327,7 +1335,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         value
         string
@@ -1362,6 +1371,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -1369,28 +1379,9 @@
     false
     false
     
-      
-        unknown
-        false
-        num1
-        string
-        0
-        true
-        false
-        false
-      
-      
-        unknown
-        false
-        num2
-        string
-        0
-        true
-        false
-        false
-      
       
         record
+        unknown
         
         
           true
@@ -1409,6 +1400,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -1419,6 +1411,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -1429,6 +1422,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -1438,7 +1432,8 @@
         false
       
       
-        unknown
+        field
+        unknown
         false
         value
         string
@@ -1457,6 +1452,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -1466,6 +1462,7 @@
     
       
         record
+        unknown
         
         
           true
@@ -1484,6 +1481,7 @@
       
       
         unknown
+        unknown
         false
         numOne
         string
@@ -1494,6 +1492,7 @@
       
       
         unknown
+        unknown
         false
         numTwo
         string
@@ -1504,6 +1503,7 @@
       
       
         unknown
+        unknown
         false
         fibonachiNumber
         string
@@ -1513,7 +1513,8 @@
         false
       
       
-        unknown
+        field
+        unknown
         false
         value
         string
@@ -1524,6 +1525,7 @@
       
       
         unknown
+        unknown
         false
         $retries
         string
@@ -1559,6 +1561,7 @@
 
   
     record
+    unknown
     false
     clearPipelineInput
     record
@@ -1568,7 +1571,8 @@
     false
     
       
-        unknown
+        field
+        unknown
         false
         preserve
         string
@@ -1589,6 +1593,7 @@
 
   
     record
+    unknown
     false
     record
     0
@@ -1604,7 +1609,7 @@
 
   
 
-
+
   
 
 
@@ -1613,6 +1618,7 @@
   
   
     unknown
+    unknown
     false
     preserve
     string
diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/node.ndf b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/node.ndf
similarity index 84%
rename from assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/node.ndf
rename to assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/node.ndf
index 79f20e62a..353894472 100644
--- a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibunachiNumber/node.ndf
+++ b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/getFibonachiNumber/node.ndf
@@ -74,7 +74,7 @@
       true
     
   
-  
+      
   no
   no
   no
@@ -83,7 +83,6 @@
   off
   no
   $null
-  
   no
   0
   0
@@ -98,6 +97,27 @@
     false
     true
   
+  
+    false
+    1
+    60
+    5
+    60
+    1
+    
+    300
+    false
+  
+  
+    TRACE
+    HEAD
+    DELETE
+    POST
+    GET
+    OPTIONS
+    PUT
+    PATCH
+  
   1
   
   true
diff --git a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf
index f79fea61b..c02cb0078 100644
--- a/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf
+++ b/assets/IS/Packages/Fibonachi/ns/Fibonachi/services/node.idf
@@ -1,7 +1,4 @@
 
 
 
-  interface
-  Fibonachi.services
-  false
 
diff --git a/assets/IS/Packages/Fibonachi/.classpath b/assets/IS/TestPackag/.classpath
similarity index 97%
rename from assets/IS/Packages/Fibonachi/.classpath
rename to assets/IS/TestPackag/.classpath
index 34b13e630..615ab5012 100644
--- a/assets/IS/Packages/Fibonachi/.classpath
+++ b/assets/IS/TestPackag/.classpath
@@ -1,34 +1,34 @@
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
diff --git a/assets/IS/TestPackag/.project b/assets/IS/TestPackag/.project
new file mode 100644
index 000000000..e74e310a1
--- /dev/null
+++ b/assets/IS/TestPackag/.project
@@ -0,0 +1,23 @@
+
+
+	TestPackag
+	
+	
+	
+	
+		
+			org.eclipse.jdt.core.javabuilder
+			
+			
+		
+		
+			com.softwareag.is.vcsintegration.ISPackageBuilder
+			
+			
+		
+	
+	
+		org.eclipse.jdt.core.javanature
+		com.softwareag.is.vcsintegration.nature
+	
+
diff --git a/assets/IS/TestPackag/manifest.v3 b/assets/IS/TestPackag/manifest.v3
new file mode 100644
index 000000000..c62aa628f
--- /dev/null
+++ b/assets/IS/TestPackag/manifest.v3
@@ -0,0 +1,13 @@
+
+
+
+  yes
+  no
+  1.0
+  
+  
+  
+  
+  
+  yes
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/flow.xml b/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/flow.xml
new file mode 100644
index 000000000..d622d1608
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/flow.xml
@@ -0,0 +1,1640 @@
+
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+
+
+
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+
+
+
+
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/flow.xml.bak b/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/flow.xml.bak
new file mode 100644
index 000000000..d622d1608
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/flow.xml.bak
@@ -0,0 +1,1640 @@
+
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+
+
+
+
+
+  
+
+  
+
+
+
+
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+
+
+
+
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/node.ndf b/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/node.ndf
new file mode 100644
index 000000000..353894472
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/getFibonachiNumber/node.ndf
@@ -0,0 +1,125 @@
+
+
+
+  flow
+  default
+  java 3.5
+  
+    
+      record
+      unknown
+      
+      false
+      record
+      0
+      IData
+      true
+      false
+      false
+      
+        
+          record
+          unknown
+          
+          
+            true
+            false
+            false
+          
+          false
+          n
+          string
+          0
+          
+          
+          true
+          false
+          false
+        
+      
+      true
+    
+    
+      record
+      unknown
+      
+      false
+      record
+      0
+      IData
+      true
+      false
+      false
+      
+        
+          record
+          unknown
+          
+          
+            true
+            false
+            false
+          
+          false
+          fibonachiNumber
+          string
+          0
+          
+          
+          true
+          false
+          false
+        
+      
+      true
+    
+  
+      
+  no
+  no
+  no
+  15
+  1
+  off
+  no
+  $null
+  no
+  0
+  0
+  none
+  none
+  0
+  
+  
+  
+    0
+    false
+    false
+    true
+  
+  
+    false
+    1
+    60
+    5
+    60
+    1
+    
+    300
+    false
+  
+  
+    TRACE
+    HEAD
+    DELETE
+    POST
+    GET
+    OPTIONS
+    PUT
+    PATCH
+  
+  1
+  
+  true
+  false
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/node.idf b/assets/IS/TestPackag/ns/TestPackag/node.idf
new file mode 100644
index 000000000..5f2272a65
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/node.idf
@@ -0,0 +1,8 @@
+
+
+
+  interface
+  unknown
+  TestPackag
+  false
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/sert/flow.xml b/assets/IS/TestPackag/ns/TestPackag/sert/flow.xml
new file mode 100644
index 000000000..d62317f7e
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/sert/flow.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/sert/flow.xml.bak b/assets/IS/TestPackag/ns/TestPackag/sert/flow.xml.bak
new file mode 100644
index 000000000..d62317f7e
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/sert/flow.xml.bak
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/assets/IS/TestPackag/ns/TestPackag/sert/node.ndf b/assets/IS/TestPackag/ns/TestPackag/sert/node.ndf
new file mode 100644
index 000000000..129114c5e
--- /dev/null
+++ b/assets/IS/TestPackag/ns/TestPackag/sert/node.ndf
@@ -0,0 +1,43 @@
+
+
+
+  flow
+  default
+  java 3.5
+  yes
+  no
+  no
+  15
+  1
+  off
+  no
+  $null
+  no
+  0
+  0
+  none
+  none
+  0
+  
+  
+  
+    0
+    false
+    false
+    true
+  
+  
+    TRACE
+    HEAD
+    DELETE
+    POST
+    GET
+    OPTIONS
+    PUT
+    PATCH
+  
+  0
+  
+  true
+  false
+
diff --git a/assets/IS/TestPackag/pub/index.html b/assets/IS/TestPackag/pub/index.html
new file mode 100644
index 000000000..42b75e8ba
--- /dev/null
+++ b/assets/IS/TestPackag/pub/index.html
@@ -0,0 +1,2 @@
+
+Welcome to the Home Page for the TestPackag Package.
\ No newline at end of file
diff --git a/bpmproject.properties b/bpmproject.properties
new file mode 100644
index 000000000..12f235ddf
--- /dev/null
+++ b/bpmproject.properties
@@ -0,0 +1,17 @@
+#CI Project Layout
+#mofidy only if you diviate from the standard structure
+
+#Asset paths
+# Use slash "/" as path separator. Example: Use "C:/SoftwareAG", instead of "C:\SoftwareAG".
+isPackages=
+isTests=
+isConfigDir=
+bpmProjects=./assets/BPM/
+mwsProjects=
+rulesProjects=
+#Should always be named UniversalMessaging
+umExport=
+
+
+
+
diff --git a/build_BPM.xml b/build_BPM.xml
new file mode 100644
index 000000000..3342cf77e
--- /dev/null
+++ b/build_BPM.xml
@@ -0,0 +1,38 @@
+
+
+        
+	
+
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+
+	
+        	
+	
+
+        
+        	
+	
+
+        
+        	
+	
+
+        
+        	
+	
+	
+
diff --git a/build.xml b/build_IS.xml
similarity index 68%
rename from build.xml
rename to build_IS.xml
index eda02ba92..d15850809 100644
--- a/build.xml
+++ b/build_IS.xml
@@ -1,58 +1,39 @@
-
-
-
-
-        
-	
-
-        
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-
-	
-        	
-	
-
-        
-        	
-	
-
-        
-        	
-	
-
-        
-        	
-	
-	
-
-
+
+
+        
+	
+
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+
+	
+        	
+	
+
+        
+        	
+	
+
+        
+        	
+	
+
+        
+        	
+	
+	
+
+