diff --git a/scripts/prepare_ezfio.sh b/scripts/ezfio_interface/prepare_ezfio.sh
similarity index 100%
rename from scripts/prepare_ezfio.sh
rename to scripts/ezfio_interface/prepare_ezfio.sh
diff --git a/scripts/run_Makefile_common.sh b/scripts/run_Makefile_common.sh
index 153fa948..c0e88a1e 100755
--- a/scripts/run_Makefile_common.sh
+++ b/scripts/run_Makefile_common.sh
@@ -65,4 +65,4 @@ fi
 ${QPACKAGE_ROOT}/scripts/create/create_Makefile_depend.sh
 
 # Update EZFIO interface
-  ${QPACKAGE_ROOT}/scripts/ezfio_interface/ei_handler.py
+${QPACKAGE_ROOT}/scripts/ezfio_interface/ei_handler.py
diff --git a/src/Makefile b/src/Makefile
index 237b3ae4..0757825b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,7 +26,7 @@ $(ALL_MODULES): ezfio
 
 # Define the EZFIO rules
 $(EZFIO): $(wildcard $(QPACKAGE_ROOT)/src/*/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/EZFIO.cfg)
-	$(QPACKAGE_ROOT)/scripts/prepare_ezfio.sh
+	$(QPACKAGE_ROOT)/scripts/ezfio_interface/prepare_ezfio.sh
 	cd $(EZFIO_DIR);\
 	export FC="$(FC)" ; export FCFLAGS="$(FCFLAGS)" ; export IRPF90="$(IRPF90)" ;\
 	$(MAKE) ;\