diff --git a/tools/export/e2studio.py b/tools/export/e2studio/__init__.py
similarity index 81%
rename from tools/export/e2studio.py
rename to tools/export/e2studio/__init__.py
index 205287089a..a80d53553b 100644
--- a/tools/export/e2studio.py
+++ b/tools/export/e2studio/__init__.py
@@ -14,9 +14,9 @@ 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 E2Studio(Exporter):
     NAME = 'e2 studio'
@@ -41,7 +41,7 @@ class E2Studio(Exporter):
             'libraries': libraries,
             'symbols': self.toolchain.get_symbols()
         }
-        self.gen_file('e2studio_%s_project.tmpl' % self.target.lower(), ctx, '.project')
-        self.gen_file('e2studio_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
-        self.gen_file('e2studio_%s_gdbinit.tmpl' % self.target.lower(), ctx, '.gdbinit')
-        self.gen_file('e2studio_launch.tmpl', ctx, '%s OpenOCD.launch' % self.project_name)
+        self.gen_file('e2studio/%s_project.tmpl' % self.target.lower(), ctx, '.project')
+        self.gen_file('e2studio/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
+        self.gen_file('e2studio/%s_gdbinit.tmpl' % self.target.lower(), ctx, '.gdbinit')
+        self.gen_file('e2studio/launch.tmpl', ctx, '%s OpenOCD.launch' % self.project_name)
diff --git a/tools/export/e2studio_launch.tmpl b/tools/export/e2studio/launch.tmpl
similarity index 100%
rename from tools/export/e2studio_launch.tmpl
rename to tools/export/e2studio/launch.tmpl
diff --git a/tools/export/e2studio_rz_a1h_cproject.tmpl b/tools/export/e2studio/rz_a1h_cproject.tmpl
similarity index 100%
rename from tools/export/e2studio_rz_a1h_cproject.tmpl
rename to tools/export/e2studio/rz_a1h_cproject.tmpl
diff --git a/tools/export/e2studio_rz_a1h_gdbinit.tmpl b/tools/export/e2studio/rz_a1h_gdbinit.tmpl
similarity index 100%
rename from tools/export/e2studio_rz_a1h_gdbinit.tmpl
rename to tools/export/e2studio/rz_a1h_gdbinit.tmpl
diff --git a/tools/export/e2studio_rz_a1h_project.tmpl b/tools/export/e2studio/rz_a1h_project.tmpl
similarity index 100%
rename from tools/export/e2studio_rz_a1h_project.tmpl
rename to tools/export/e2studio/rz_a1h_project.tmpl