diff --git a/rtl/datamover_engine.sv b/rtl/datamover_engine.sv
index 04ee1f5..bcade4f 100644
--- a/rtl/datamover_engine.sv
+++ b/rtl/datamover_engine.sv
@@ -15,10 +15,11 @@
  * Authors:  Francesco Conti <f.conti@unibo.it>
  */
 
-import hwpe_stream_package::*;
-import hci_package::*;
 
-module datamover_engine #(
+module datamover_engine
+  import hwpe_stream_package::*;
+  import hci_package::*;
+#(
   parameter int unsigned FIFO_DEPTH = 4,
   parameter int unsigned BW_ALIGNED = 32
 ) (
diff --git a/rtl/datamover_streamer.sv b/rtl/datamover_streamer.sv
index d7e6b91..31dc3b2 100644
--- a/rtl/datamover_streamer.sv
+++ b/rtl/datamover_streamer.sv
@@ -15,11 +15,12 @@
  * Authors:  Francesco Conti <f.conti@unibo.it>
  */
 
-import hwpe_stream_package::*;
-import hci_package::*;
-import datamover_package::*;
 
-module datamover_streamer #(
+module datamover_streamer
+  import hwpe_stream_package::*;
+  import hci_package::*;
+  import datamover_package::*;
+#(
   parameter int unsigned TCDM_FIFO_DEPTH = 2,
   parameter int unsigned BW = 32
 ) (
diff --git a/rtl/datamover_top.sv b/rtl/datamover_top.sv
index 2bbc5e4..2a63038 100644
--- a/rtl/datamover_top.sv
+++ b/rtl/datamover_top.sv
@@ -15,11 +15,12 @@
  * Authors:  Francesco Conti <f.conti@unibo.it>
  */
 
-import hwpe_ctrl_package::*;
-import hci_package::*;
-import datamover_package::*;
 
-module datamover_top #(
+module datamover_top
+  import hwpe_ctrl_package::*;
+  import hci_package::*;
+  import datamover_package::*;
+ #(
   parameter int unsigned ID        = 10,
   parameter int unsigned BW        = 288,
   parameter int unsigned N_CORES   = 8,