diff --git a/modules/iframe/application/controllers/IndexController.php b/application/controllers/IframeController.php
similarity index 79%
rename from modules/iframe/application/controllers/IndexController.php
rename to application/controllers/IframeController.php
index 7e9ddf648..8aebba4af 100644
--- a/modules/iframe/application/controllers/IndexController.php
+++ b/application/controllers/IframeController.php
@@ -1,14 +1,14 @@
 <?php
 /* Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Iframe\Controllers;
+namespace Icinga\Controllers;
 
 use Icinga\Web\Controller;
 
 /**
  * Display external or internal links within an iframe
  */
-class IndexController extends Controller
+class IframeController extends Controller
 {
     /**
      * Display iframe w/ the given URL
diff --git a/application/views/scripts/iframe/index.phtml b/application/views/scripts/iframe/index.phtml
new file mode 100644
index 000000000..7f409d0f6
--- /dev/null
+++ b/application/views/scripts/iframe/index.phtml
@@ -0,0 +1,4 @@
+<div class="controls">
+    <?= $tabs ?>
+</div>
+<iframe src="<?= $this->escape($url) ?>" style="height:99%; width:99%;" frameborder="no"></iframe>
\ No newline at end of file
diff --git a/modules/iframe/application/views/scripts/index/index.phtml b/modules/iframe/application/views/scripts/index/index.phtml
deleted file mode 100644
index cd5184009..000000000
--- a/modules/iframe/application/views/scripts/index/index.phtml
+++ /dev/null
@@ -1 +0,0 @@
-<iframe src="<?= $this->escape($url) ?>" style="height:100%; width:99%;" frameborder="no"></iframe>
diff --git a/modules/iframe/module.info b/modules/iframe/module.info
deleted file mode 100644
index e774a56a1..000000000
--- a/modules/iframe/module.info
+++ /dev/null
@@ -1,3 +0,0 @@
-Module: iframe
-Version: 2.1.2
-Description: Display web sites within Icinga Web 2 via iframes