diff --git a/library/Director/IcingaConfig/IcingaCommandsConfigFile.php b/library/Director/IcingaConfig/IcingaCommandsConfigFile.php
deleted file mode 100644
index 57579ebb..00000000
--- a/library/Director/IcingaConfig/IcingaCommandsConfigFile.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Icinga\Module\Director\IcingaConfig;
-
-class IcingaCommandsConfigFile extends IcingaConfigFile
-{
-    protected $content = "library \"methods\"\n\n";
-}
diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php
index d636d9ef..7aa7c00e 100644
--- a/library/Director/IcingaConfig/IcingaConfig.php
+++ b/library/Director/IcingaConfig/IcingaConfig.php
@@ -48,7 +48,10 @@ class IcingaConfig
             $class = 'Icinga\\Module\\Director\\IcingaConfig\\Icinga'
                    . ucfirst($type)
                    . 'sConfigFile';
-            $file = new $class();
+            $file = new IcingaConfigFile();
+            if ($type === 'command') {
+                $file->prepend("library \"methods\"\n\n");
+            }
             $file->addObjects($objects);
             $this->files[$type . 's.conf'] = $file;
         }
diff --git a/library/Director/IcingaConfig/IcingaConfigFile.php b/library/Director/IcingaConfig/IcingaConfigFile.php
index 16c2150f..e8c80df3 100644
--- a/library/Director/IcingaConfig/IcingaConfigFile.php
+++ b/library/Director/IcingaConfig/IcingaConfigFile.php
@@ -8,6 +8,12 @@ class IcingaConfigFile
 {
     protected $content;
 
+    public function prepend($content)
+    {
+        $this->content = $content . $this->content;
+        return $this;
+    }
+
     public function getContent()
     {
         return $this->content;
diff --git a/library/Director/IcingaConfig/IcingaHostsConfigFile.php b/library/Director/IcingaConfig/IcingaHostsConfigFile.php
deleted file mode 100644
index 7583e82b..00000000
--- a/library/Director/IcingaConfig/IcingaHostsConfigFile.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Icinga\Module\Director\IcingaConfig;
-
-class IcingaHostsConfigFile extends IcingaConfigFile
-{
-}
diff --git a/library/Director/IcingaConfig/IcingaServicesConfigFile.php b/library/Director/IcingaConfig/IcingaServicesConfigFile.php
deleted file mode 100644
index 7959fa0a..00000000
--- a/library/Director/IcingaConfig/IcingaServicesConfigFile.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Icinga\Module\Director\IcingaConfig;
-
-class IcingaServicesConfigFile extends IcingaConfigFile
-{
-}
diff --git a/library/Director/IcingaConfig/IcingaUsersConfigFile.php b/library/Director/IcingaConfig/IcingaUsersConfigFile.php
deleted file mode 100644
index bb2af97a..00000000
--- a/library/Director/IcingaConfig/IcingaUsersConfigFile.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Icinga\Module\Director\IcingaConfig;
-
-class IcingaUsersConfigFile extends IcingaConfigFile
-{
-}
diff --git a/library/Director/IcingaConfig/IcingaZonesConfigFile.php b/library/Director/IcingaConfig/IcingaZonesConfigFile.php
deleted file mode 100644
index bde8f6dc..00000000
--- a/library/Director/IcingaConfig/IcingaZonesConfigFile.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Icinga\Module\Director\IcingaConfig;
-
-class IcingaZonesConfigFile extends IcingaConfigFile
-{
-}