diff --git a/application/controllers/about.php b/application/controllers/about.php
index ae30294..215fe2b 100644
--- a/application/controllers/about.php
+++ b/application/controllers/about.php
@@ -22,7 +22,7 @@
  */
 
 /**
- * Static about page.
+ * Static about pages.
  *
  * @author Karsten Heiken <karsten@disposed.de>
  */
@@ -36,7 +36,11 @@ class About extends MY_Controller {
 	}
 
 	public function index() {
-		$this->load->view('about');
+		$this->load->view('about/about');
+	}
+
+	public function license() {
+		$this->load->view('about/license');
 	}
 }
 
diff --git a/application/controllers/license.php b/application/controllers/license.php
deleted file mode 100644
index 3c931f0..0000000
--- a/application/controllers/license.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php defined('BASEPATH') || exit('No direct script access allowed');
-/*
- * Copyright (c) 2011 Karsten Heiken, Eike Foken
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * Static license page.
- *
- * @author Karsten Heiken <karsten@disposed.de>
- */
-class License extends MY_Controller {
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
-	public function index() {
-		$this->load->view('license');
-	}
-}
-
-/* End of file license.php */
-/* Location: ./application/controllers/license.php */
diff --git a/application/views/about.php b/application/views/about/about.php
similarity index 100%
rename from application/views/about.php
rename to application/views/about/about.php
diff --git a/application/views/about/license.php b/application/views/about/license.php
new file mode 100644
index 0000000..e8c1a80
--- /dev/null
+++ b/application/views/about/license.php
@@ -0,0 +1,37 @@
+<?php $this->load->view('header');?>
+
+<div id="content">
+
+	<div class="title">
+		<h2><?=_('License');?></h2>
+	</div>
+
+	<div class="box">
+		<h3><?=_('This application is released under the MIT License');?></h3>
+		<p>The MIT License</p>
+		<p>Copyright (c) 2011 Karsten Heiken, Eike Foken</p>
+		<p>
+			Permission is hereby granted, free of charge, to any person obtaining a copy
+			of this software and associated documentation files (the "Software"), to deal
+			in the Software without restriction, including without limitation the rights
+			to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+			copies of the Software, and to permit persons to whom the Software is
+			furnished to do so, subject to the following conditions:
+		</p>
+		<p>
+			The above copyright notice and this permission notice shall be included in
+			all copies or substantial portions of the Software.
+		</p>
+		<p>
+			THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+			IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+			FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+			AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+			LIABILITY, WHETHER IN AN ACTION OF	CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+			OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+			THE SOFTWARE.
+		</p>
+	</div>
+</div>
+
+<?php $this->load->view('footer');?>
diff --git a/application/views/footer.php b/application/views/footer.php
index b835b49..3629111 100644
--- a/application/views/footer.php
+++ b/application/views/footer.php
@@ -4,7 +4,7 @@
 		</span>
 		<span class="left">
 			<?=anchor('about', _('About'));?> |
-			<?=anchor('license', _('License'));?>
+			<?=anchor('about/license', _('License'));?>
 		</span>
 	</div>
 
diff --git a/application/views/license.php b/application/views/license.php
deleted file mode 100644
index ee2daa3..0000000
--- a/application/views/license.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php $this->load->view('header'); ?>
-
-<div id="content">
-
-	<div class="title">
-		<h2><?=_('License');?></h2>
-	</div>
-
-	<div class="box">
-		<h3>This application is licensed under the MIT License for Open Source Software</h3>
-		<p>Copyright (c) 2011 Karsten Heiken, Eike Foken</p>
-
-		<p>
-			Permission is hereby granted, free of charge, to any person obtaining<br />
-			a copy of this software and associated documentation files (the "Software"),<br />
-			to deal in the Software without restriction, including without limitation<br />
-			the rights to use, copy, modify, merge, publish, distribute, sublicense,<br />
-			and/or sell copies of the Software, and to permit persons to whom the Software<br /> 
-			is furnished to do so, subject to the following conditions:
-		</p>
-
-		<p>
-			The above copyright notice and this permission notice shall be included in all<br />
-			copies or substantial portions of the Software.
-		</p>
-
-		<p>
-			THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,<br />
-			EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES<br />
-			OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND<br />
-			NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT<br />
-			HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,<br />
-			WHETHER IN AN ACTION OF	CONTRACT, TORT OR OTHERWISE, ARISING<br />
-			FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE	OR THE USE OR <br />
-			OTHER DEALINGS IN THE SOFTWARE.
-		</p>
-	</div>
-</div>
-
-<?php $this->load->view('footer'); ?>