diff --git a/lang/__init__.py b/lang/__init__.py
index 09ac653..5c8740b 100644
--- a/lang/__init__.py
+++ b/lang/__init__.py
@@ -9,7 +9,27 @@
 
 from .domain import Domain
 from .fds_case import FDSCase
-from .landuse import LanduseType
+from .landuse_type import LanduseType
 from .terrain import GEOMTerrain, OBSTTerrain
 from .texture import Texture
 from .wind import Wind
+from .params import (
+    ChidParam,
+    OriginParam,
+    NMeshParam,
+    PixelSizeParam,
+    TexPixelSizeParam,
+    CellSizeParam,
+    StartTimeParam,
+    EndTimeParam,
+    FDSPathParam,
+    LanduseTypeFilepathParam,
+    TextFilepathParam,
+    WindFilepathParam,
+    DEMLayerParam,
+    LanduseLayerParam,
+    ExtentLayerParam,
+    FireLayer,
+    ExportOBSTParam,
+)
+from .utils import *
diff --git a/lang/domain.py b/lang/domain.py
index 36f8fcd..7d9cefd 100644
--- a/lang/domain.py
+++ b/lang/domain.py
@@ -8,7 +8,7 @@
 __revision__ = "$Format:%H$"  # replaced with git SHA1
 
 from math import sqrt
-from .. import utils
+from . import utils
 
 
 class Domain:
diff --git a/lang/fds_case.py b/lang/fds_case.py
index 0b7c36f..818e733 100644
--- a/lang/fds_case.py
+++ b/lang/fds_case.py
@@ -10,7 +10,7 @@
 import time, os
 from qgis.core import Qgis, QgsProject
 from qgis.utils import pluginMetadata
-from .. import utils
+from . import utils
 
 
 class FDSCase:
diff --git a/lang/landuse.py b/lang/landuse_type.py
similarity index 99%
rename from lang/landuse.py
rename to lang/landuse_type.py
index 1a071e4..2deb600 100644
--- a/lang/landuse.py
+++ b/lang/landuse_type.py
@@ -9,7 +9,7 @@
 
 import csv, re, os
 from qgis.core import QgsProcessingException
-from .. import utils
+from . import utils
 
 
 class LanduseType:
diff --git a/qgis2fds_params.py b/lang/params.py
similarity index 100%
rename from qgis2fds_params.py
rename to lang/params.py
diff --git a/lang/terrain.py b/lang/terrain.py
index 0990af3..58099f1 100644
--- a/lang/terrain.py
+++ b/lang/terrain.py
@@ -10,7 +10,7 @@
 import os
 import numpy as np
 from qgis.core import QgsProcessingException
-from .. import utils
+from . import utils
 
 
 class GEOMTerrain:
diff --git a/utils.py b/lang/utils.py
similarity index 100%
rename from utils.py
rename to lang/utils.py
diff --git a/qgis2fds_export_algo.py b/qgis2fds_export_algo.py
index 1b586be..d95f60a 100644
--- a/qgis2fds_export_algo.py
+++ b/qgis2fds_export_algo.py
@@ -26,9 +26,7 @@
 import processing
 import time
 
-from .qgis2fds_params import *
-from .lang import FDSCase, Domain, OBSTTerrain, GEOMTerrain, LanduseType, Texture, Wind
-from . import utils
+from .lang import *
 
 DEBUG = False