diff --git a/bundle/bundle--calendar.el b/bundle/bundle--calendar.el
new file mode 100644
index 00000000..746d1749
--- /dev/null
+++ b/bundle/bundle--calendar.el
@@ -0,0 +1,50 @@
+(setq holiday-oriental-holidays nil)
+(setq holiday-islamic-holidays nil)
+(setq holiday-bahai-holidays nil)
+(setq holiday-hebrew-holidays nil)
+(setq holiday-general-holidays
+      '((holiday-fixed 1 1 "Neujahr")
+        (holiday-fixed 5 1 "1. Mai")
+        (holiday-fixed 10 3 "Tag der Deutschen Einheit")))
+(setq holiday-christian-holidays
+      '((holiday-float 12 0 -4 "1. Advent" 24)
+        (holiday-float 12 0 -3 "2. Advent" 24)
+        (holiday-float 12 0 -2 "3. Advent" 24)
+        (holiday-float 12 0 -1 "4. Advent" 24)
+        (holiday-fixed 12 25 "1. Weihnachtstag")
+        (holiday-fixed 12 26 "2. Weihnachtstag")
+        (holiday-fixed 1 6 "Heilige Drei Könige")
+        (holiday-easter-etc -48 "Rosenmontag")
+        ;; (holiday-easter-etc -3 "Gründonnerstag")
+        (holiday-easter-etc  -2 "Karfreitag")
+        (holiday-easter-etc   0 "Ostersonntag")
+        (holiday-easter-etc  +1 "Ostermontag")
+        (holiday-easter-etc +39 "Christi Himmelfahrt")
+        (holiday-easter-etc +49 "Pfingstsonntag")
+        (holiday-easter-etc +50 "Pfingstmontag")
+        (holiday-easter-etc +60 "Fronleichnam")
+        (holiday-fixed 8 15 "Mariae Himmelfahrt")
+        (holiday-fixed 11 1 "Allerheiligen")
+        ;; (holiday-float 11 3 1 "Buss- und Bettag" 16)
+        (holiday-float 11 0 1 "Totensonntag" 20)))
+
+(use-package calendar
+  :ensure nil
+  :config
+  (setq calendar-latitude 49.4)
+  (setq calendar-longitude 11.0)
+  (setq calendar-location-name "Nuremberg, DE")
+  :custom
+  (european-calendar-style t)
+  (calendar-christian-all-holidays-flag t)
+  (calendar-date-style (quote iso))
+  (calendar-view-diary-initially-flag t)
+  (calendar-week-start-day 1)
+  (calendar-intermonth-text
+   '(propertize
+     (format "%2d"
+             (car
+              (calendar-iso-from-absolute
+               (calendar-absolute-from-gregorian
+                (list month day year )))))
+     'font-lock-face 'font-lock-function-name-face)))
diff --git a/init.el b/init.el
index a90a297c..e98fb56a 100755
--- a/init.el
+++ b/init.el
@@ -17,27 +17,6 @@
 (mouse-wheel-mode 1)
 (blink-cursor-mode -1)
 
-(use-package calendar
-  :ensure nil
-  :config
-  (setq calendar-latitude 49.4)
-  (setq calendar-longitude 11.0)
-  (setq calendar-location-name "Nuremberg, DE")
-  :custom
-  (european-calendar-style t)
-  (calendar-christian-all-holidays-flag t)
-  (calendar-date-style (quote iso))
-  (calendar-view-diary-initially-flag t)
-  (calendar-week-start-day 1)
-  (calendar-intermonth-text
-   '(propertize
-     (format "%2d"
-             (car
-              (calendar-iso-from-absolute
-               (calendar-absolute-from-gregorian
-                (list month day year )))))
-     'font-lock-face 'font-lock-function-name-face)))
-
 (setq ispell-program-name "hunspell")
 (setq grep-command "grep -i -nH -e ")
 
@@ -131,45 +110,6 @@
 (set-keyboard-coding-system 'utf-8)
 (setq default-buffer-file-coding-system 'utf-8-unix)
 (setenv "PYTHONIOENCODING" "UTF-8")
-;;;
-
-(setq holiday-oriental-holidays nil)
-(setq holiday-islamic-holidays nil)
-(setq holiday-bahai-holidays nil)
-(setq holiday-hebrew-holidays nil)
-(setq holiday-general-holidays
-      '((holiday-fixed 1 1 "Neujahr")
-        (holiday-fixed 5 1 "1. Mai")
-        (holiday-fixed 10 3 "Tag der Deutschen Einheit")))
-(setq holiday-christian-holidays
-      '((holiday-float 12 0 -4 "1. Advent" 24)
-        (holiday-float 12 0 -3 "2. Advent" 24)
-        (holiday-float 12 0 -2 "3. Advent" 24)
-        (holiday-float 12 0 -1 "4. Advent" 24)
-        (holiday-fixed 12 25 "1. Weihnachtstag")
-        (holiday-fixed 12 26 "2. Weihnachtstag")
-        (holiday-fixed 1 6 "Heilige Drei Könige")
-        (holiday-easter-etc -48 "Rosenmontag")
-        ;; (holiday-easter-etc -3 "Gründonnerstag")
-        (holiday-easter-etc  -2 "Karfreitag")
-        (holiday-easter-etc   0 "Ostersonntag")
-        (holiday-easter-etc  +1 "Ostermontag")
-        (holiday-easter-etc +39 "Christi Himmelfahrt")
-        (holiday-easter-etc +49 "Pfingstsonntag")
-        (holiday-easter-etc +50 "Pfingstmontag")
-        (holiday-easter-etc +60 "Fronleichnam")
-        (holiday-fixed 8 15 "Mariae Himmelfahrt")
-        (holiday-fixed 11 1 "Allerheiligen")
-        ;; (holiday-float 11 3 1 "Buss- und Bettag" 16)
-        (holiday-float 11 0 1 "Totensonntag" 20)))
-
-;;; bundle--server
-(require 'server)
-;; Start a server if (server-running-p) does not return t (e.g. if it
-;; returns nil or :other)
-(or (eq (server-running-p) t)
-    (server-start))
-;;;
 
 (use-package tramp
   :ensure nil