diff --git a/rendercv/renderer/themes/__init__.py b/rendercv/themes/__init__.py
similarity index 100%
rename from rendercv/renderer/themes/__init__.py
rename to rendercv/themes/__init__.py
diff --git a/rendercv/renderer/themes/classic/BulletEntry.j2.tex b/rendercv/themes/classic/BulletEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/BulletEntry.j2.tex
rename to rendercv/themes/classic/BulletEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/EducationEntry.j2.tex b/rendercv/themes/classic/EducationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/EducationEntry.j2.tex
rename to rendercv/themes/classic/EducationEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/ExperienceEntry.j2.tex b/rendercv/themes/classic/ExperienceEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/ExperienceEntry.j2.tex
rename to rendercv/themes/classic/ExperienceEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/Header.j2.tex b/rendercv/themes/classic/Header.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/Header.j2.tex
rename to rendercv/themes/classic/Header.j2.tex
diff --git a/rendercv/renderer/themes/classic/NormalEntry.j2.tex b/rendercv/themes/classic/NormalEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/NormalEntry.j2.tex
rename to rendercv/themes/classic/NormalEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/OneLineEntry.j2.tex b/rendercv/themes/classic/OneLineEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/OneLineEntry.j2.tex
rename to rendercv/themes/classic/OneLineEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/Preamble.j2.tex b/rendercv/themes/classic/Preamble.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/Preamble.j2.tex
rename to rendercv/themes/classic/Preamble.j2.tex
diff --git a/rendercv/renderer/themes/classic/PublicationEntry.j2.tex b/rendercv/themes/classic/PublicationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/PublicationEntry.j2.tex
rename to rendercv/themes/classic/PublicationEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/SectionBeginning.j2.tex b/rendercv/themes/classic/SectionBeginning.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/SectionBeginning.j2.tex
rename to rendercv/themes/classic/SectionBeginning.j2.tex
diff --git a/rendercv/renderer/themes/classic/SectionEnding.j2.tex b/rendercv/themes/classic/SectionEnding.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/SectionEnding.j2.tex
rename to rendercv/themes/classic/SectionEnding.j2.tex
diff --git a/rendercv/renderer/themes/classic/TextEntry.j2.tex b/rendercv/themes/classic/TextEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/classic/TextEntry.j2.tex
rename to rendercv/themes/classic/TextEntry.j2.tex
diff --git a/rendercv/renderer/themes/classic/__init__.py b/rendercv/themes/classic/__init__.py
similarity index 100%
rename from rendercv/renderer/themes/classic/__init__.py
rename to rendercv/themes/classic/__init__.py
diff --git a/rendercv/renderer/themes/engineeringresumes/BulletEntry.j2.tex b/rendercv/themes/engineeringresumes/BulletEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/BulletEntry.j2.tex
rename to rendercv/themes/engineeringresumes/BulletEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/EducationEntry.j2.tex b/rendercv/themes/engineeringresumes/EducationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/EducationEntry.j2.tex
rename to rendercv/themes/engineeringresumes/EducationEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/ExperienceEntry.j2.tex b/rendercv/themes/engineeringresumes/ExperienceEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/ExperienceEntry.j2.tex
rename to rendercv/themes/engineeringresumes/ExperienceEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/Header.j2.tex b/rendercv/themes/engineeringresumes/Header.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/Header.j2.tex
rename to rendercv/themes/engineeringresumes/Header.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/NormalEntry.j2.tex b/rendercv/themes/engineeringresumes/NormalEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/NormalEntry.j2.tex
rename to rendercv/themes/engineeringresumes/NormalEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/OneLineEntry.j2.tex b/rendercv/themes/engineeringresumes/OneLineEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/OneLineEntry.j2.tex
rename to rendercv/themes/engineeringresumes/OneLineEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/Preamble.j2.tex b/rendercv/themes/engineeringresumes/Preamble.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/Preamble.j2.tex
rename to rendercv/themes/engineeringresumes/Preamble.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/PublicationEntry.j2.tex b/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/PublicationEntry.j2.tex
rename to rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/SectionBeginning.j2.tex b/rendercv/themes/engineeringresumes/SectionBeginning.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/SectionBeginning.j2.tex
rename to rendercv/themes/engineeringresumes/SectionBeginning.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/SectionEnding.j2.tex b/rendercv/themes/engineeringresumes/SectionEnding.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/SectionEnding.j2.tex
rename to rendercv/themes/engineeringresumes/SectionEnding.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/TextEntry.j2.tex b/rendercv/themes/engineeringresumes/TextEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/TextEntry.j2.tex
rename to rendercv/themes/engineeringresumes/TextEntry.j2.tex
diff --git a/rendercv/renderer/themes/engineeringresumes/__init__.py b/rendercv/themes/engineeringresumes/__init__.py
similarity index 100%
rename from rendercv/renderer/themes/engineeringresumes/__init__.py
rename to rendercv/themes/engineeringresumes/__init__.py
diff --git a/rendercv/renderer/themes/main.j2.html b/rendercv/themes/main.j2.html
similarity index 100%
rename from rendercv/renderer/themes/main.j2.html
rename to rendercv/themes/main.j2.html
diff --git a/rendercv/renderer/themes/main.j2.md b/rendercv/themes/main.j2.md
similarity index 100%
rename from rendercv/renderer/themes/main.j2.md
rename to rendercv/themes/main.j2.md
diff --git a/rendercv/renderer/themes/main.j2.tex b/rendercv/themes/main.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/main.j2.tex
rename to rendercv/themes/main.j2.tex
diff --git a/rendercv/renderer/themes/markdown/BulletEntry.j2.md b/rendercv/themes/markdown/BulletEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/BulletEntry.j2.md
rename to rendercv/themes/markdown/BulletEntry.j2.md
diff --git a/rendercv/renderer/themes/markdown/EducationEntry.j2.md b/rendercv/themes/markdown/EducationEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/EducationEntry.j2.md
rename to rendercv/themes/markdown/EducationEntry.j2.md
diff --git a/rendercv/renderer/themes/markdown/ExperienceEntry.j2.md b/rendercv/themes/markdown/ExperienceEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/ExperienceEntry.j2.md
rename to rendercv/themes/markdown/ExperienceEntry.j2.md
diff --git a/rendercv/renderer/themes/markdown/Header.j2.md b/rendercv/themes/markdown/Header.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/Header.j2.md
rename to rendercv/themes/markdown/Header.j2.md
diff --git a/rendercv/renderer/themes/markdown/NormalEntry.j2.md b/rendercv/themes/markdown/NormalEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/NormalEntry.j2.md
rename to rendercv/themes/markdown/NormalEntry.j2.md
diff --git a/rendercv/renderer/themes/markdown/OneLineEntry.j2.md b/rendercv/themes/markdown/OneLineEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/OneLineEntry.j2.md
rename to rendercv/themes/markdown/OneLineEntry.j2.md
diff --git a/rendercv/renderer/themes/markdown/PublicationEntry.j2.md b/rendercv/themes/markdown/PublicationEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/PublicationEntry.j2.md
rename to rendercv/themes/markdown/PublicationEntry.j2.md
diff --git a/rendercv/renderer/themes/markdown/SectionBeginning.j2.md b/rendercv/themes/markdown/SectionBeginning.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/SectionBeginning.j2.md
rename to rendercv/themes/markdown/SectionBeginning.j2.md
diff --git a/rendercv/renderer/themes/markdown/TextEntry.j2.md b/rendercv/themes/markdown/TextEntry.j2.md
similarity index 100%
rename from rendercv/renderer/themes/markdown/TextEntry.j2.md
rename to rendercv/themes/markdown/TextEntry.j2.md
diff --git a/rendercv/renderer/themes/moderncv/BulletEntry.j2.tex b/rendercv/themes/moderncv/BulletEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/BulletEntry.j2.tex
rename to rendercv/themes/moderncv/BulletEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/EducationEntry.j2.tex b/rendercv/themes/moderncv/EducationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/EducationEntry.j2.tex
rename to rendercv/themes/moderncv/EducationEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/ExperienceEntry.j2.tex b/rendercv/themes/moderncv/ExperienceEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/ExperienceEntry.j2.tex
rename to rendercv/themes/moderncv/ExperienceEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/Header.j2.tex b/rendercv/themes/moderncv/Header.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/Header.j2.tex
rename to rendercv/themes/moderncv/Header.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/NormalEntry.j2.tex b/rendercv/themes/moderncv/NormalEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/NormalEntry.j2.tex
rename to rendercv/themes/moderncv/NormalEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/OneLineEntry.j2.tex b/rendercv/themes/moderncv/OneLineEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/OneLineEntry.j2.tex
rename to rendercv/themes/moderncv/OneLineEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/Preamble.j2.tex b/rendercv/themes/moderncv/Preamble.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/Preamble.j2.tex
rename to rendercv/themes/moderncv/Preamble.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/PublicationEntry.j2.tex b/rendercv/themes/moderncv/PublicationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/PublicationEntry.j2.tex
rename to rendercv/themes/moderncv/PublicationEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/SectionBeginning.j2.tex b/rendercv/themes/moderncv/SectionBeginning.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/SectionBeginning.j2.tex
rename to rendercv/themes/moderncv/SectionBeginning.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/SectionEnding.j2.tex b/rendercv/themes/moderncv/SectionEnding.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/SectionEnding.j2.tex
rename to rendercv/themes/moderncv/SectionEnding.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/TextEntry.j2.tex b/rendercv/themes/moderncv/TextEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/moderncv/TextEntry.j2.tex
rename to rendercv/themes/moderncv/TextEntry.j2.tex
diff --git a/rendercv/renderer/themes/moderncv/__init__.py b/rendercv/themes/moderncv/__init__.py
similarity index 100%
rename from rendercv/renderer/themes/moderncv/__init__.py
rename to rendercv/themes/moderncv/__init__.py
diff --git a/rendercv/renderer/themes/sb2nov/BulletEntry.j2.tex b/rendercv/themes/sb2nov/BulletEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/BulletEntry.j2.tex
rename to rendercv/themes/sb2nov/BulletEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/EducationEntry.j2.tex b/rendercv/themes/sb2nov/EducationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/EducationEntry.j2.tex
rename to rendercv/themes/sb2nov/EducationEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/ExperienceEntry.j2.tex b/rendercv/themes/sb2nov/ExperienceEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/ExperienceEntry.j2.tex
rename to rendercv/themes/sb2nov/ExperienceEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/Header.j2.tex b/rendercv/themes/sb2nov/Header.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/Header.j2.tex
rename to rendercv/themes/sb2nov/Header.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/NormalEntry.j2.tex b/rendercv/themes/sb2nov/NormalEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/NormalEntry.j2.tex
rename to rendercv/themes/sb2nov/NormalEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/OneLineEntry.j2.tex b/rendercv/themes/sb2nov/OneLineEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/OneLineEntry.j2.tex
rename to rendercv/themes/sb2nov/OneLineEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/Preamble.j2.tex b/rendercv/themes/sb2nov/Preamble.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/Preamble.j2.tex
rename to rendercv/themes/sb2nov/Preamble.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/PublicationEntry.j2.tex b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/PublicationEntry.j2.tex
rename to rendercv/themes/sb2nov/PublicationEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/SectionBeginning.j2.tex b/rendercv/themes/sb2nov/SectionBeginning.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/SectionBeginning.j2.tex
rename to rendercv/themes/sb2nov/SectionBeginning.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/SectionEnding.j2.tex b/rendercv/themes/sb2nov/SectionEnding.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/SectionEnding.j2.tex
rename to rendercv/themes/sb2nov/SectionEnding.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/TextEntry.j2.tex b/rendercv/themes/sb2nov/TextEntry.j2.tex
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/TextEntry.j2.tex
rename to rendercv/themes/sb2nov/TextEntry.j2.tex
diff --git a/rendercv/renderer/themes/sb2nov/__init__.py b/rendercv/themes/sb2nov/__init__.py
similarity index 100%
rename from rendercv/renderer/themes/sb2nov/__init__.py
rename to rendercv/themes/sb2nov/__init__.py