diff --git a/aleksis/apps/chronos/templates/timetable/all.html b/aleksis/apps/chronos/templates/chronos/all.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/all.html
rename to aleksis/apps/chronos/templates/chronos/all.html
diff --git a/aleksis/apps/chronos/templates/timetable/datepicker.html b/aleksis/apps/chronos/templates/chronos/datepicker.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/datepicker.html
rename to aleksis/apps/chronos/templates/chronos/datepicker.html
diff --git a/aleksis/apps/chronos/templates/timetable/fallback.html b/aleksis/apps/chronos/templates/chronos/fallback.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/fallback.html
rename to aleksis/apps/chronos/templates/chronos/fallback.html
diff --git a/aleksis/apps/chronos/templates/timetable/hintform.html b/aleksis/apps/chronos/templates/chronos/hintform.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/hintform.html
rename to aleksis/apps/chronos/templates/chronos/hintform.html
diff --git a/aleksis/apps/chronos/templates/timetable/hints.html b/aleksis/apps/chronos/templates/chronos/hints.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/hints.html
rename to aleksis/apps/chronos/templates/chronos/hints.html
diff --git a/aleksis/apps/chronos/templates/timetable/hintsinplan.html b/aleksis/apps/chronos/templates/chronos/hintsinplan.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/hintsinplan.html
rename to aleksis/apps/chronos/templates/chronos/hintsinplan.html
diff --git a/aleksis/apps/chronos/templates/timetable/hintsinsub.html b/aleksis/apps/chronos/templates/chronos/hintsinsub.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/hintsinsub.html
rename to aleksis/apps/chronos/templates/chronos/hintsinsub.html
diff --git a/aleksis/apps/chronos/templates/timetable/hintsinsubprint.html b/aleksis/apps/chronos/templates/chronos/hintsinsubprint.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/hintsinsubprint.html
rename to aleksis/apps/chronos/templates/chronos/hintsinsubprint.html
diff --git a/aleksis/apps/chronos/templates/timetable/latex/header.tex b/aleksis/apps/chronos/templates/chronos/latex/header.tex
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/latex/header.tex
rename to aleksis/apps/chronos/templates/chronos/latex/header.tex
diff --git a/aleksis/apps/chronos/templates/timetable/latex/hints.tex b/aleksis/apps/chronos/templates/chronos/latex/hints.tex
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/latex/hints.tex
rename to aleksis/apps/chronos/templates/chronos/latex/hints.tex
diff --git a/aleksis/apps/chronos/templates/timetable/latex/room.tex b/aleksis/apps/chronos/templates/chronos/latex/room.tex
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/latex/room.tex
rename to aleksis/apps/chronos/templates/chronos/latex/room.tex
diff --git a/aleksis/apps/chronos/templates/timetable/latex/subject.tex b/aleksis/apps/chronos/templates/chronos/latex/subject.tex
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/latex/subject.tex
rename to aleksis/apps/chronos/templates/chronos/latex/subject.tex
diff --git a/aleksis/apps/chronos/templates/timetable/latex/substitutions.tex b/aleksis/apps/chronos/templates/chronos/latex/substitutions.tex
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/latex/substitutions.tex
rename to aleksis/apps/chronos/templates/chronos/latex/substitutions.tex
diff --git a/aleksis/apps/chronos/templates/timetable/latex/teacher.tex b/aleksis/apps/chronos/templates/chronos/latex/teacher.tex
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/latex/teacher.tex
rename to aleksis/apps/chronos/templates/chronos/latex/teacher.tex
diff --git a/aleksis/apps/chronos/templates/timetable/lesson.html b/aleksis/apps/chronos/templates/chronos/lesson.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/lesson.html
rename to aleksis/apps/chronos/templates/chronos/lesson.html
diff --git a/aleksis/apps/chronos/templates/timetable/myplan.html b/aleksis/apps/chronos/templates/chronos/myplan.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/myplan.html
rename to aleksis/apps/chronos/templates/chronos/myplan.html
diff --git a/aleksis/apps/chronos/templates/timetable/plan.html b/aleksis/apps/chronos/templates/chronos/plan.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/plan.html
rename to aleksis/apps/chronos/templates/chronos/plan.html
diff --git a/aleksis/apps/chronos/templates/timetable/quicklaunch.html b/aleksis/apps/chronos/templates/chronos/quicklaunch.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/quicklaunch.html
rename to aleksis/apps/chronos/templates/chronos/quicklaunch.html
diff --git a/aleksis/apps/chronos/templates/timetable/subs/room.html b/aleksis/apps/chronos/templates/chronos/subs/room.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/subs/room.html
rename to aleksis/apps/chronos/templates/chronos/subs/room.html
diff --git a/aleksis/apps/chronos/templates/timetable/subs/subject.html b/aleksis/apps/chronos/templates/chronos/subs/subject.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/subs/subject.html
rename to aleksis/apps/chronos/templates/chronos/subs/subject.html
diff --git a/aleksis/apps/chronos/templates/timetable/subs/teacher.html b/aleksis/apps/chronos/templates/chronos/subs/teacher.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/subs/teacher.html
rename to aleksis/apps/chronos/templates/chronos/subs/teacher.html
diff --git a/aleksis/apps/chronos/templates/timetable/substitution.html b/aleksis/apps/chronos/templates/chronos/substitution.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/substitution.html
rename to aleksis/apps/chronos/templates/chronos/substitution.html
diff --git a/aleksis/apps/chronos/templates/timetable/substitutionprint.html b/aleksis/apps/chronos/templates/chronos/substitutionprint.html
similarity index 100%
rename from aleksis/apps/chronos/templates/timetable/substitutionprint.html
rename to aleksis/apps/chronos/templates/chronos/substitutionprint.html