diff --git a/tools/export/kds.py b/tools/export/kds/__init__.py
similarity index 84%
rename from tools/export/kds.py
rename to tools/export/kds/__init__.py
index b77a507f17..c663c9c875 100644
--- a/tools/export/kds.py
+++ b/tools/export/kds/__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 splitext, basename
 
+from tools.export.exporters import Exporter
+
 
 class KDS(Exporter):
     NAME = 'Kinetis Design Studio'
@@ -42,6 +43,6 @@ class KDS(Exporter):
             'libraries': libraries,
             'symbols': self.toolchain.get_symbols()
         }
-        self.gen_file('kds_%s_project.tmpl' % self.target.lower(), ctx, '.project')
-        self.gen_file('kds_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
-        self.gen_file('kds_launch.tmpl', ctx, '%s.launch' % self.project_name)
+        self.gen_file('kds/%s_project.tmpl' % self.target.lower(), ctx, '.project')
+        self.gen_file('kds/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
+        self.gen_file('kds/launch.tmpl', ctx, '%s.launch' % self.project_name)
diff --git a/tools/export/kds_hexiwear_cproject.tmpl b/tools/export/kds/hexiwear_cproject.tmpl
similarity index 100%
rename from tools/export/kds_hexiwear_cproject.tmpl
rename to tools/export/kds/hexiwear_cproject.tmpl
diff --git a/tools/export/kds_hexiwear_project.tmpl b/tools/export/kds/hexiwear_project.tmpl
similarity index 100%
rename from tools/export/kds_hexiwear_project.tmpl
rename to tools/export/kds/hexiwear_project.tmpl
diff --git a/tools/export/kds_k22f_cproject.tmpl b/tools/export/kds/k22f_cproject.tmpl
similarity index 100%
rename from tools/export/kds_k22f_cproject.tmpl
rename to tools/export/kds/k22f_cproject.tmpl
diff --git a/tools/export/kds_k22f_project.tmpl b/tools/export/kds/k22f_project.tmpl
similarity index 100%
rename from tools/export/kds_k22f_project.tmpl
rename to tools/export/kds/k22f_project.tmpl
diff --git a/tools/export/kds_k64f_cproject.tmpl b/tools/export/kds/k64f_cproject.tmpl
similarity index 100%
rename from tools/export/kds_k64f_cproject.tmpl
rename to tools/export/kds/k64f_cproject.tmpl
diff --git a/tools/export/kds_k64f_project.tmpl b/tools/export/kds/k64f_project.tmpl
similarity index 100%
rename from tools/export/kds_k64f_project.tmpl
rename to tools/export/kds/k64f_project.tmpl
diff --git a/tools/export/kds_launch.tmpl b/tools/export/kds/launch.tmpl
similarity index 100%
rename from tools/export/kds_launch.tmpl
rename to tools/export/kds/launch.tmpl