diff --git a/workspace_tools/export/iar.py b/workspace_tools/export/iar.py
index 750e8e7e57..8e1ec80389 100644
--- a/workspace_tools/export/iar.py
+++ b/workspace_tools/export/iar.py
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from exporters import Exporter
-
+import re
 
 class IAREmbeddedWorkbench(Exporter):
     NAME = 'IAR'
@@ -69,14 +69,15 @@ class IAREmbeddedWorkbench(Exporter):
     ]
 
     def generate(self):
-
         sources = []
         sources += self.resources.c_sources
         sources += self.resources.cpp_sources
         sources += self.resources.s_sources
-        # binaries = ""
-        # if resources.bin_files is not None:
-          # binaries = resources.bin_files
+        
+        iar_files = IAR_FOLDER("","",[])
+        for source in sources:
+            iar_files.insert_file(source)
+          
         ctx = {
             'name': self.program_name,
             'include_paths': self.resources.inc_dirs,
@@ -84,9 +85,74 @@ class IAREmbeddedWorkbench(Exporter):
             'object_files': self.resources.objects,
             'libraries': self.resources.libraries,
             'symbols': self.get_symbols(),
-            'source_files': sources,
+            'source_files': iar_files.__str__(),
             'binary_files': self.resources.bin_files,
         }
         self.gen_file('iar_%s.ewp.tmpl' % self.target.lower(), ctx, '%s.ewp' % self.program_name)
         self.gen_file('iar.eww.tmpl', ctx, '%s.eww' % self.program_name)
         self.gen_file('iar_%s.ewd.tmpl' % self.target.lower(), ctx, '%s.ewd' % self.program_name)
+
+class IAR_FOLDER:
+    #input:
+    #folder_level : folder path to current folder
+    #folder_name : name of current folder
+    #source_files : list of source_files (all must be in same directory)
+    def __init__(self, folder_level, folder_name, source_files):
+        self.folder_level = folder_level
+        self.folder_name = folder_name
+        self.source_files = source_files
+        self.sub_folders = {};
+    
+    def __str__(self):
+        group_start = ""
+        group_end = ""
+        if self.folder_name != "":
+            group_start = "<group>\n<name>%s</name>\n" %(self.folder_name)
+            group_end = "</group>\n"
+
+        str_content = group_start
+        #Add files in current folder
+        if self.source_files:
+            for src in self.source_files:
+                str_content += "<file>\n<name>$PROJ_DIR$\\%s</name>\n</file>\n" % src
+        ##Add sub folders
+        if self.sub_folders:
+            for folder_name in self.sub_folders.iterkeys():
+                str_content += self.sub_folders[folder_name].__str__()
+        
+        str_content += group_end
+        return str_content
+    
+    
+    def insert_file(self, source_input):
+        if self.source_files:
+            dir_sources = IAR_FOLDER.get_directory(self.source_files[0]) ##All source_files in a IAR_FOLDER must be in same directory.
+            if not self.folder_level == dir_sources: ## Check if sources are already at their deepest level.
+                _reg_exp = r"^" + re.escape(self.folder_level) + r"[/\\]?([^/\\]+)"
+                folder_name = re.match( _reg_exp, dir_sources).group(1)
+                self.sub_folders[folder_name] = IAR_FOLDER(self.folder_level + "\\" + folder_name, folder_name, self.source_files)
+                self.source_files = []
+  
+        dir_input = IAR_FOLDER.get_directory(source_input)
+        if dir_input == self.folder_level:
+            self.source_files.append(source_input)
+        else:
+            _reg_exp = r"^" + re.escape(self.folder_level) + r"[/\\]?([^/\\]+)"
+            folder_name = re.match( _reg_exp, dir_input).group(1)
+            if self.sub_folders.has_key(folder_name):
+                self.sub_folders[folder_name].insert_file(source_input)
+            else:
+                if self.folder_level == "": #Top level exception
+                    self.sub_folders[folder_name] = IAR_FOLDER(folder_name, folder_name, [source_input])
+                else:
+                    self.sub_folders[folder_name] = IAR_FOLDER(self.folder_level + "\\" + folder_name, folder_name, [source_input])
+
+    @staticmethod    
+    def get_directory(file_path):
+        dir_Match = re.match( r'(.*)[/\\][^/\\]+', file_path)
+        if dir_Match is not None:
+            return dir_Match.group(1)
+        else:
+            return ""
+            
+            
\ No newline at end of file
diff --git a/workspace_tools/export/iar_arch_ble.ewp.tmpl b/workspace_tools/export/iar_arch_ble.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_arch_ble.ewp.tmpl
+++ b/workspace_tools/export/iar_arch_ble.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_arch_pro.ewp.tmpl b/workspace_tools/export/iar_arch_pro.ewp.tmpl
index 2fc053682d..5cb39e3f45 100644
--- a/workspace_tools/export/iar_arch_pro.ewp.tmpl
+++ b/workspace_tools/export/iar_arch_pro.ewp.tmpl
@@ -1823,11 +1823,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_delta_dfcm_nnn40.ewp.tmpl b/workspace_tools/export/iar_delta_dfcm_nnn40.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_delta_dfcm_nnn40.ewp.tmpl
+++ b/workspace_tools/export/iar_delta_dfcm_nnn40.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_hrm1017.ewp.tmpl b/workspace_tools/export/iar_hrm1017.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_hrm1017.ewp.tmpl
+++ b/workspace_tools/export/iar_hrm1017.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_k20d50m.ewp.tmpl b/workspace_tools/export/iar_k20d50m.ewp.tmpl
index 044f686c0e..24b15f9f69 100644
--- a/workspace_tools/export/iar_k20d50m.ewp.tmpl
+++ b/workspace_tools/export/iar_k20d50m.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}	
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_k22f.ewp.tmpl b/workspace_tools/export/iar_k22f.ewp.tmpl
index d15be76f2f..bfaee1dbb9 100644
--- a/workspace_tools/export/iar_k22f.ewp.tmpl
+++ b/workspace_tools/export/iar_k22f.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}	
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_k64f.ewp.tmpl b/workspace_tools/export/iar_k64f.ewp.tmpl
index d4af0f945e..0a7408568c 100644
--- a/workspace_tools/export/iar_k64f.ewp.tmpl
+++ b/workspace_tools/export/iar_k64f.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}	
+  {{source_files}}	
 </project>
 
 
diff --git a/workspace_tools/export/iar_kl05z.ewp.tmpl b/workspace_tools/export/iar_kl05z.ewp.tmpl
index 80868bf4de..ed7f6f9950 100644
--- a/workspace_tools/export/iar_kl05z.ewp.tmpl
+++ b/workspace_tools/export/iar_kl05z.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}	
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_kl25z.ewp.tmpl b/workspace_tools/export/iar_kl25z.ewp.tmpl
index 98b676cee2..8a197ba65c 100644
--- a/workspace_tools/export/iar_kl25z.ewp.tmpl
+++ b/workspace_tools/export/iar_kl25z.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_kl46z.ewp.tmpl b/workspace_tools/export/iar_kl46z.ewp.tmpl
index 51ed9b674d..f47b9295fe 100644
--- a/workspace_tools/export/iar_kl46z.ewp.tmpl
+++ b/workspace_tools/export/iar_kl46z.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc1114.ewp.tmpl b/workspace_tools/export/iar_lpc1114.ewp.tmpl
index 291bf1f26d..b5bfc8a2ee 100644
--- a/workspace_tools/export/iar_lpc1114.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1114.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc11u24.ewp.tmpl b/workspace_tools/export/iar_lpc11u24.ewp.tmpl
index 1d866b0500..e41acb7fe2 100644
--- a/workspace_tools/export/iar_lpc11u24.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc11u24.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl b/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl
index 337c43a03b..a4ff036a5b 100644
--- a/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc11u35_401.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}  
+  {{source_files}}  
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl b/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl
index bc94dfb59a..b223a20367 100644
--- a/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc11u35_501.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc1347.ewp.tmpl b/workspace_tools/export/iar_lpc1347.ewp.tmpl
index e1b1ee4828..d612df1a87 100644
--- a/workspace_tools/export/iar_lpc1347.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1347.ewp.tmpl
@@ -953,11 +953,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc1549.ewp.tmpl b/workspace_tools/export/iar_lpc1549.ewp.tmpl
index fb0a172c59..2a3442135b 100644
--- a/workspace_tools/export/iar_lpc1549.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1549.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc1768.ewp.tmpl b/workspace_tools/export/iar_lpc1768.ewp.tmpl
index 2fc053682d..5cb39e3f45 100644
--- a/workspace_tools/export/iar_lpc1768.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc1768.ewp.tmpl
@@ -1823,11 +1823,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc4088.ewp.tmpl b/workspace_tools/export/iar_lpc4088.ewp.tmpl
index 9bd19007cf..e1ffe051f1 100644
--- a/workspace_tools/export/iar_lpc4088.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc4088.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc4088_dm.ewp.tmpl b/workspace_tools/export/iar_lpc4088_dm.ewp.tmpl
index 9bd19007cf..e1ffe051f1 100644
--- a/workspace_tools/export/iar_lpc4088_dm.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc4088_dm.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc812.ewp.tmpl b/workspace_tools/export/iar_lpc812.ewp.tmpl
index f0c6a30638..e84ba4b48f 100644
--- a/workspace_tools/export/iar_lpc812.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc812.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpc824.ewp.tmpl b/workspace_tools/export/iar_lpc824.ewp.tmpl
index dfd6b36b8c..bdb393af54 100644
--- a/workspace_tools/export/iar_lpc824.ewp.tmpl
+++ b/workspace_tools/export/iar_lpc824.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_lpccappuccino.ewp.tmpl b/workspace_tools/export/iar_lpccappuccino.ewp.tmpl
index f0a986e0b5..ddf5d8decc 100644
--- a/workspace_tools/export/iar_lpccappuccino.ewp.tmpl
+++ b/workspace_tools/export/iar_lpccappuccino.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_mts_dragonfly_f411re.ewp.tmpl b/workspace_tools/export/iar_mts_dragonfly_f411re.ewp.tmpl
index 5c63ddaea5..b20bc2d512 100644
--- a/workspace_tools/export/iar_mts_dragonfly_f411re.ewp.tmpl
+++ b/workspace_tools/export/iar_mts_dragonfly_f411re.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_mts_mdot_f405re.ewd.tmpl b/workspace_tools/export/iar_mts_mdot_f405rg.ewd.tmpl
similarity index 100%
rename from workspace_tools/export/iar_mts_mdot_f405re.ewd.tmpl
rename to workspace_tools/export/iar_mts_mdot_f405rg.ewd.tmpl
diff --git a/workspace_tools/export/iar_mts_mdot_f405rg.ewp.tmpl b/workspace_tools/export/iar_mts_mdot_f405rg.ewp.tmpl
index 68c5f7299f..ff5452582a 100644
--- a/workspace_tools/export/iar_mts_mdot_f405rg.ewp.tmpl
+++ b/workspace_tools/export/iar_mts_mdot_f405rg.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_mts_mdot_f411re.ewp.tmpl b/workspace_tools/export/iar_mts_mdot_f411re.ewp.tmpl
index fd04d3212d..d56dc845e0 100644
--- a/workspace_tools/export/iar_mts_mdot_f411re.ewp.tmpl
+++ b/workspace_tools/export/iar_mts_mdot_f411re.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nrf51822.ewp.tmpl b/workspace_tools/export/iar_nrf51822.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_nrf51822.ewp.tmpl
+++ b/workspace_tools/export/iar_nrf51822.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nrf51_dk.ewp.tmpl b/workspace_tools/export/iar_nrf51_dk.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_nrf51_dk.ewp.tmpl
+++ b/workspace_tools/export/iar_nrf51_dk.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nrf51_dongle.ewp.tmpl b/workspace_tools/export/iar_nrf51_dongle.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_nrf51_dongle.ewp.tmpl
+++ b/workspace_tools/export/iar_nrf51_dongle.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f030r8.ewp.tmpl b/workspace_tools/export/iar_nucleo_f030r8.ewp.tmpl
index 72b0a20a79..1520c06d68 100644
--- a/workspace_tools/export/iar_nucleo_f030r8.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f030r8.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f070rb.ewp.tmpl b/workspace_tools/export/iar_nucleo_f070rb.ewp.tmpl
index 85fe012717..8c511747cb 100644
--- a/workspace_tools/export/iar_nucleo_f070rb.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f070rb.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f072rb.ewp.tmpl b/workspace_tools/export/iar_nucleo_f072rb.ewp.tmpl
index c225154fd1..923e2923ee 100644
--- a/workspace_tools/export/iar_nucleo_f072rb.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f072rb.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f091rc.ewp.tmpl b/workspace_tools/export/iar_nucleo_f091rc.ewp.tmpl
index 408cf12117..b7e758c3a6 100644
--- a/workspace_tools/export/iar_nucleo_f091rc.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f091rc.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl b/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl
index cc7df8d7d5..e77beade94 100644
--- a/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f103rb.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}  
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f302r8.ewp.tmpl b/workspace_tools/export/iar_nucleo_f302r8.ewp.tmpl
index c9fbdf67b8..9907e5eaac 100644
--- a/workspace_tools/export/iar_nucleo_f302r8.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f302r8.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f303re.ewp.tmpl b/workspace_tools/export/iar_nucleo_f303re.ewp.tmpl
index b94664c3c2..6c83366262 100644
--- a/workspace_tools/export/iar_nucleo_f303re.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f303re.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f334r8.ewp.tmpl b/workspace_tools/export/iar_nucleo_f334r8.ewp.tmpl
index 221e711f35..7f267e6463 100644
--- a/workspace_tools/export/iar_nucleo_f334r8.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f334r8.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f401re.ewp.tmpl b/workspace_tools/export/iar_nucleo_f401re.ewp.tmpl
index 5ba99f67a8..e9d54cbb5e 100644
--- a/workspace_tools/export/iar_nucleo_f401re.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f401re.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_f411re.ewp.tmpl b/workspace_tools/export/iar_nucleo_f411re.ewp.tmpl
index e208106323..05ecbefba2 100644
--- a/workspace_tools/export/iar_nucleo_f411re.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_f411re.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_l053r8.ewp.tmpl b/workspace_tools/export/iar_nucleo_l053r8.ewp.tmpl
index 9aee907f76..c9c4362ada 100644
--- a/workspace_tools/export/iar_nucleo_l053r8.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_l053r8.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_nucleo_l152re.ewp.tmpl b/workspace_tools/export/iar_nucleo_l152re.ewp.tmpl
index a5b943dfde..53025e0c17 100644
--- a/workspace_tools/export/iar_nucleo_l152re.ewp.tmpl
+++ b/workspace_tools/export/iar_nucleo_l152re.ewp.tmpl
@@ -1893,11 +1893,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_seeed_tiny_ble.ewp.tmpl b/workspace_tools/export/iar_seeed_tiny_ble.ewp.tmpl
index 114db792bb..14a35a8a06 100644
--- a/workspace_tools/export/iar_seeed_tiny_ble.ewp.tmpl
+++ b/workspace_tools/export/iar_seeed_tiny_ble.ewp.tmpl
@@ -950,11 +950,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>
 
 
diff --git a/workspace_tools/export/iar_stm32f407.ewp.tmpl b/workspace_tools/export/iar_stm32f407.ewp.tmpl
index e077ea16dc..b463eb74f8 100644
--- a/workspace_tools/export/iar_stm32f407.ewp.tmpl
+++ b/workspace_tools/export/iar_stm32f407.ewp.tmpl
@@ -948,11 +948,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}  
+  {{source_files}} 
 </project>
 
 
diff --git a/workspace_tools/export/iar_ublox_c027.ewp.tmpl b/workspace_tools/export/iar_ublox_c027.ewp.tmpl
index 9aba3349ed..92e99379a1 100644
--- a/workspace_tools/export/iar_ublox_c027.ewp.tmpl
+++ b/workspace_tools/export/iar_ublox_c027.ewp.tmpl
@@ -1823,11 +1823,7 @@
       <data/>
     </settings>
   </configuration>
-  {% for files in source_files %}
-  <file>
-    <name>$PROJ_DIR$\{{files}}</name>
-  </file>
-  {% endfor %}
+  {{source_files}}
 </project>