diff --git a/tools/export/ds5_5.py b/tools/export/ds5_5/__init__.py
similarity index 88%
rename from tools/export/ds5_5.py
rename to tools/export/ds5_5/__init__.py
index 9be2535867..00acacf554 100644
--- a/tools/export/ds5_5.py
+++ b/tools/export/ds5_5/__init__.py
@@ -14,9 +14,10 @@ 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.
 """
-from exporters import Exporter
 from os.path import basename
 
+from tools.export.exporters import Exporter
+
 
 class DS5_5(Exporter):
     NAME = 'DS5'
@@ -64,6 +65,6 @@ class DS5_5(Exporter):
         target = self.target.lower()
 
         # Project file
-        self.gen_file('ds5_5_%s.project.tmpl' % target, ctx, '.project')
-        self.gen_file('ds5_5_%s.cproject.tmpl' % target, ctx, '.cproject')
-        self.gen_file('ds5_5_%s.launch.tmpl' % target, ctx, 'ds5_%s.launch' % target)
+        self.gen_file('ds5_5/%s.project.tmpl' % target, ctx, '.project')
+        self.gen_file('ds5_5/%s.cproject.tmpl' % target, ctx, '.cproject')
+        self.gen_file('ds5_5/%s.launch.tmpl' % target, ctx, 'ds5_%s.launch' % target)
diff --git a/tools/export/ds5_5_arch_pro.cproject.tmpl b/tools/export/ds5_5/arch_pro.cproject.tmpl
similarity index 100%
rename from tools/export/ds5_5_arch_pro.cproject.tmpl
rename to tools/export/ds5_5/arch_pro.cproject.tmpl
diff --git a/tools/export/ds5_5_arch_pro.launch.tmpl b/tools/export/ds5_5/arch_pro.launch.tmpl
similarity index 100%
rename from tools/export/ds5_5_arch_pro.launch.tmpl
rename to tools/export/ds5_5/arch_pro.launch.tmpl
diff --git a/tools/export/ds5_5_arch_pro.project.tmpl b/tools/export/ds5_5/arch_pro.project.tmpl
similarity index 100%
rename from tools/export/ds5_5_arch_pro.project.tmpl
rename to tools/export/ds5_5/arch_pro.project.tmpl
diff --git a/tools/export/ds5_5_lpc11u24.cproject.tmpl b/tools/export/ds5_5/lpc11u24.cproject.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc11u24.cproject.tmpl
rename to tools/export/ds5_5/lpc11u24.cproject.tmpl
diff --git a/tools/export/ds5_5_lpc11u24.launch.tmpl b/tools/export/ds5_5/lpc11u24.launch.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc11u24.launch.tmpl
rename to tools/export/ds5_5/lpc11u24.launch.tmpl
diff --git a/tools/export/ds5_5_lpc11u24.project.tmpl b/tools/export/ds5_5/lpc11u24.project.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc11u24.project.tmpl
rename to tools/export/ds5_5/lpc11u24.project.tmpl
diff --git a/tools/export/ds5_5_lpc1768.cproject.tmpl b/tools/export/ds5_5/lpc1768.cproject.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc1768.cproject.tmpl
rename to tools/export/ds5_5/lpc1768.cproject.tmpl
diff --git a/tools/export/ds5_5_lpc1768.launch.tmpl b/tools/export/ds5_5/lpc1768.launch.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc1768.launch.tmpl
rename to tools/export/ds5_5/lpc1768.launch.tmpl
diff --git a/tools/export/ds5_5_lpc1768.project.tmpl b/tools/export/ds5_5/lpc1768.project.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc1768.project.tmpl
rename to tools/export/ds5_5/lpc1768.project.tmpl
diff --git a/tools/export/ds5_5_lpc812.cproject.tmpl b/tools/export/ds5_5/lpc812.cproject.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc812.cproject.tmpl
rename to tools/export/ds5_5/lpc812.cproject.tmpl
diff --git a/tools/export/ds5_5_lpc812.launch.tmpl b/tools/export/ds5_5/lpc812.launch.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc812.launch.tmpl
rename to tools/export/ds5_5/lpc812.launch.tmpl
diff --git a/tools/export/ds5_5_lpc812.project.tmpl b/tools/export/ds5_5/lpc812.project.tmpl
similarity index 100%
rename from tools/export/ds5_5_lpc812.project.tmpl
rename to tools/export/ds5_5/lpc812.project.tmpl
diff --git a/tools/export/ds5_5_rz_a1h.cproject.tmpl b/tools/export/ds5_5/rz_a1h.cproject.tmpl
similarity index 100%
rename from tools/export/ds5_5_rz_a1h.cproject.tmpl
rename to tools/export/ds5_5/rz_a1h.cproject.tmpl
diff --git a/tools/export/ds5_5_rz_a1h.launch.tmpl b/tools/export/ds5_5/rz_a1h.launch.tmpl
similarity index 100%
rename from tools/export/ds5_5_rz_a1h.launch.tmpl
rename to tools/export/ds5_5/rz_a1h.launch.tmpl
diff --git a/tools/export/ds5_5_rz_a1h.project.tmpl b/tools/export/ds5_5/rz_a1h.project.tmpl
similarity index 100%
rename from tools/export/ds5_5_rz_a1h.project.tmpl
rename to tools/export/ds5_5/rz_a1h.project.tmpl
diff --git a/tools/export/ds5_5_ublox_c027.cproject.tmpl b/tools/export/ds5_5/ublox_c027.cproject.tmpl
similarity index 100%
rename from tools/export/ds5_5_ublox_c027.cproject.tmpl
rename to tools/export/ds5_5/ublox_c027.cproject.tmpl
diff --git a/tools/export/ds5_5_ublox_c027.launch.tmpl b/tools/export/ds5_5/ublox_c027.launch.tmpl
similarity index 100%
rename from tools/export/ds5_5_ublox_c027.launch.tmpl
rename to tools/export/ds5_5/ublox_c027.launch.tmpl
diff --git a/tools/export/ds5_5_ublox_c027.project.tmpl b/tools/export/ds5_5/ublox_c027.project.tmpl
similarity index 100%
rename from tools/export/ds5_5_ublox_c027.project.tmpl
rename to tools/export/ds5_5/ublox_c027.project.tmpl