diff --git a/sandbox/embed_selfhost_errors.html b/sandbox/embed_selfhost_errors.html
index 1506817..1ab0c80 100644
--- a/sandbox/embed_selfhost_errors.html
+++ b/sandbox/embed_selfhost_errors.html
@@ -48,9 +48,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -61,7 +62,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/sandbox/embed_selfhost_externallibs.html b/sandbox/embed_selfhost_externallibs.html
index 113b0a2..70700ab 100644
--- a/sandbox/embed_selfhost_externallibs.html
+++ b/sandbox/embed_selfhost_externallibs.html
@@ -48,9 +48,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -61,7 +62,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/sandbox/embed_selfhost_fullscreen.html b/sandbox/embed_selfhost_fullscreen.html
index b7a70aa..bdf8e29 100644
--- a/sandbox/embed_selfhost_fullscreen.html
+++ b/sandbox/embed_selfhost_fullscreen.html
@@ -47,9 +47,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -60,7 +61,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/sandbox/embed_selfhost_manual.html b/sandbox/embed_selfhost_manual.html
index 3c0284b..23dae24 100644
--- a/sandbox/embed_selfhost_manual.html
+++ b/sandbox/embed_selfhost_manual.html
@@ -48,9 +48,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -61,7 +62,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/sandbox/embed_selfhost_multiple.html b/sandbox/embed_selfhost_multiple.html
index abc315f..673d510 100644
--- a/sandbox/embed_selfhost_multiple.html
+++ b/sandbox/embed_selfhost_multiple.html
@@ -48,9 +48,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -61,7 +62,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/sandbox/embed_selfhost_single.html b/sandbox/embed_selfhost_single.html
index 98eb477..53b0691 100644
--- a/sandbox/embed_selfhost_single.html
+++ b/sandbox/embed_selfhost_single.html
@@ -47,9 +47,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -60,7 +61,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/sandbox/embed_selfhost_single_scroll.html b/sandbox/embed_selfhost_single_scroll.html
index 4ef2e25..0e56fef 100644
--- a/sandbox/embed_selfhost_single_scroll.html
+++ b/sandbox/embed_selfhost_single_scroll.html
@@ -47,9 +47,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -60,7 +61,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/source/import/importer.js b/source/import/importer.js
index 80390e9..534b453 100644
--- a/source/import/importer.js
+++ b/source/import/importer.js
@@ -225,7 +225,8 @@ OV.Importer = class
             new OV.ImporterGltf (),
             new OV.ImporterO3dv (),
             new OV.Importer3dm (),
-            new OV.ImporterIfc ()
+            new OV.ImporterIfc (),
+            new OV.ImporterThree ()
         ];
         this.fileList = new OV.FileList ();
         this.model = null;
diff --git a/source/threejs/threeimporter.js b/source/import/importerthree.js
similarity index 99%
rename from source/threejs/threeimporter.js
rename to source/import/importerthree.js
index 4004737..ee6cf86 100644
--- a/source/threejs/threeimporter.js
+++ b/source/import/importerthree.js
@@ -207,7 +207,7 @@ OV.ThreeLoader3mf = class extends OV.ThreeLoader
     }
 };
 
-OV.ThreeImporter = class extends OV.ImporterBase
+OV.ImporterThree = class extends OV.ImporterBase
 {
     constructor ()
     {
diff --git a/source/threejs/threemodelloader.js b/source/threejs/threemodelloader.js
index 2638128..5126896 100644
--- a/source/threejs/threemodelloader.js
+++ b/source/threejs/threemodelloader.js
@@ -3,7 +3,6 @@ OV.ThreeModelLoader = class
     constructor ()
     {
         this.importer = new OV.Importer ();
-        this.importer.AddImporter (new OV.ThreeImporter ());
         this.callbacks = null;
         this.inProgress = false;
         this.defaultMaterial = null;
diff --git a/tools/config.json b/tools/config.json
index baba080..21b237e 100644
--- a/tools/config.json
+++ b/tools/config.json
@@ -44,9 +44,10 @@
 		"source/import/importer3ds.js",
 		"source/import/importergltf.js",
 		"source/import/importero3dv.js",
-		"source/import/importer.js",
+		"source/import/importerthree.js",
 		"source/import/importer3dm.js",
 		"source/import/importerifc.js",
+		"source/import/importer.js",
 		"source/export/exporterbase.js",
 		"source/export/exporterobj.js",
 		"source/export/exporterstl.js",
@@ -57,7 +58,6 @@
 		"source/export/exporter.js",
 		"source/threejs/threeutils.js",
 		"source/threejs/threeconverter.js",
-		"source/threejs/threeimporter.js",
 		"source/threejs/threemodelloader.js",
 		"source/parameters/parameterlist.js",
 		"source/viewer/domutils.js",
diff --git a/website/embed.html b/website/embed.html
index 888fc30..be424e3 100644
--- a/website/embed.html
+++ b/website/embed.html
@@ -57,9 +57,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -70,7 +71,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
diff --git a/website/index.html b/website/index.html
index c9538de..13e2559 100644
--- a/website/index.html
+++ b/website/index.html
@@ -57,9 +57,10 @@
 	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
 	<script type="text/javascript" src="../source/import/importergltf.js"></script>
 	<script type="text/javascript" src="../source/import/importero3dv.js"></script>
-	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/import/importerthree.js"></script>
 	<script type="text/javascript" src="../source/import/importer3dm.js"></script>
 	<script type="text/javascript" src="../source/import/importerifc.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
 	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
 	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
 	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
@@ -70,7 +71,6 @@
 	<script type="text/javascript" src="../source/export/exporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeutils.js"></script>
 	<script type="text/javascript" src="../source/threejs/threeconverter.js"></script>
-	<script type="text/javascript" src="../source/threejs/threeimporter.js"></script>
 	<script type="text/javascript" src="../source/threejs/threemodelloader.js"></script>
 	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
 	<script type="text/javascript" src="../source/viewer/domutils.js"></script>