diff --git a/src/cv/common/sections/header.tex b/src/common/sections/header.tex
similarity index 100%
rename from src/cv/common/sections/header.tex
rename to src/common/sections/header.tex
diff --git a/src/cv/common/spacing.tex b/src/common/style/spacing.tex
similarity index 100%
rename from src/cv/common/spacing.tex
rename to src/common/style/spacing.tex
diff --git a/src/cv/common/style.tex b/src/common/style/symbol.tex
similarity index 100%
rename from src/cv/common/style.tex
rename to src/common/style/symbol.tex
diff --git a/src/cv/common/cv_common_main.tex b/src/cv/common/cv_common_main.tex
new file mode 100644
index 0000000..2ff2907
--- /dev/null
+++ b/src/cv/common/cv_common_main.tex
@@ -0,0 +1,5 @@
+\input{../../../cv/common/package}
+\input{../../../cv/common/cv_override}
+
+\input{../../../common/style/spacing}
+\input{../../../common/style/symbol}
diff --git a/src/cv/common/moderncv_override.tex b/src/cv/common/cv_override.tex
similarity index 100%
rename from src/cv/common/moderncv_override.tex
rename to src/cv/common/cv_override.tex
diff --git a/src/cv/common/main.tex b/src/cv/common/package.tex
similarity index 50%
rename from src/cv/common/main.tex
rename to src/cv/common/package.tex
index 8899abc..b54cabc 100644
--- a/src/cv/common/main.tex
+++ b/src/cv/common/package.tex
@@ -3,8 +3,4 @@
 \usepackage{etoolbox}
 \usepackage{fontawesome5}
 \usepackage{xpatch}
-\usepackage{xstring}
-
-\input{../../common/moderncv_override}
-\input{../../common/spacing}
-\input{../../common/style}
+\usepackage{xstring}
\ No newline at end of file
diff --git a/src/cv/lang/en/cv.tex b/src/cv/lang/en/cv.tex
index 409586d..47c28d6 100644
--- a/src/cv/lang/en/cv.tex
+++ b/src/cv/lang/en/cv.tex
@@ -2,7 +2,7 @@
 \moderncvtheme[blue]{classic}
 
 \usepackage[margin=1.55cm]{geometry}
-\input{../../common/main}
+\input{../../../cv/common/cv_common_main}
 \input{./sections/00_header}
 
 \nopagenumbers
diff --git a/src/cv/lang/en/sections/00_header.tex b/src/cv/lang/en/sections/00_header.tex
index 5b22efa..c63f377 100644
--- a/src/cv/lang/en/sections/00_header.tex
+++ b/src/cv/lang/en/sections/00_header.tex
@@ -1,4 +1,4 @@
-\input{../../common/sections/header}
+\input{../../../common/sections/header}
 \extrainfo{
   \begin{tabular}[t]{@{}r@{}}
     Date of birth: 01/01/1970 \\
diff --git a/src/cv/lang/fr/cv.tex b/src/cv/lang/fr/cv.tex
index 409586d..47c28d6 100644
--- a/src/cv/lang/fr/cv.tex
+++ b/src/cv/lang/fr/cv.tex
@@ -2,7 +2,7 @@
 \moderncvtheme[blue]{classic}
 
 \usepackage[margin=1.55cm]{geometry}
-\input{../../common/main}
+\input{../../../cv/common/cv_common_main}
 \input{./sections/00_header}
 
 \nopagenumbers
diff --git a/src/cv/lang/fr/sections/00_header.tex b/src/cv/lang/fr/sections/00_header.tex
index 9dfd9e1..f79e4b0 100644
--- a/src/cv/lang/fr/sections/00_header.tex
+++ b/src/cv/lang/fr/sections/00_header.tex
@@ -1,4 +1,4 @@
-\input{../../common/sections/header}
+\input{../../../common/sections/header}
 \extrainfo{
   \begin{tabular}[t]{@{}r@{}}
     Date~de~naissance~:~01/01/1970 \\
diff --git a/src/template/cv/cv.tex b/src/template/cv/cv.tex
index 409586d..47c28d6 100644
--- a/src/template/cv/cv.tex
+++ b/src/template/cv/cv.tex
@@ -2,7 +2,7 @@
 \moderncvtheme[blue]{classic}
 
 \usepackage[margin=1.55cm]{geometry}
-\input{../../common/main}
+\input{../../../cv/common/cv_common_main}
 \input{./sections/00_header}
 
 \nopagenumbers
diff --git a/src/template/cv/sections/00_header.tex b/src/template/cv/sections/00_header.tex
index 79eb3bb..d402d94 100644
--- a/src/template/cv/sections/00_header.tex
+++ b/src/template/cv/sections/00_header.tex
@@ -1,2 +1,2 @@
-\input{../../common/sections/header}
+\input{../../../common/sections/header}
 \extrainfo{}
\ No newline at end of file