diff --git a/class/dashboard/subpage-diagnostics.php b/class/layout/diagnostics.php
similarity index 99%
rename from class/dashboard/subpage-diagnostics.php
rename to class/layout/diagnostics.php
index 64e61a9..041c473 100644
--- a/class/dashboard/subpage-diagnostics.php
+++ b/class/layout/diagnostics.php
@@ -13,7 +13,7 @@
  * @author Stefan Herndler
  * @since 1.5.0
  */
-class MCI_Footnotes_Layout_Diagnostics extends MCI_Footnotes_LayoutEngine {
+class MCI_Footnotes_Layout_Diagnostics extends MCI_Footnotes_Layout_Engine {
 
 	/**
 	 * Returns a Priority index. Lower numbers have a higher Priority.
diff --git a/class/dashboard/class-mci-footnotes-layoutengine.php b/class/layout/engine.php
similarity index 99%
rename from class/dashboard/class-mci-footnotes-layoutengine.php
rename to class/layout/engine.php
index 73dbc5e..147b4e0 100644
--- a/class/dashboard/class-mci-footnotes-layoutengine.php
+++ b/class/layout/engine.php
@@ -24,7 +24,7 @@
  * @author Stefan Herndler
  * @since  1.5.0
  */
-abstract class MCI_Footnotes_LayoutEngine {
+abstract class MCI_Footnotes_Layout_Engine {
 
 	/**
 	 * Stores the Hook connection string for the child sub page.
diff --git a/class/dashboard/class-mci-footnotes-layout-init.php b/class/layout/init.php
similarity index 99%
rename from class/dashboard/class-mci-footnotes-layout-init.php
rename to class/layout/init.php
index ccfa988..843c8e2 100644
--- a/class/dashboard/class-mci-footnotes-layout-init.php
+++ b/class/layout/init.php
@@ -52,7 +52,7 @@ class MCI_Footnotes_Layout_Init {
 		// iterate through each class define in the current script.
 		foreach ( get_declared_classes() as $l_str_class_name ) {
 			// accept only child classes of the layout engine.
-			if ( is_subclass_of( $l_str_class_name, 'MCI_Footnotes_LayoutEngine' ) ) {
+			if ( is_subclass_of( $l_str_class_name, 'MCI_Footnotes_Layout_Engine' ) ) {
 				$l_obj_class = new $l_str_class_name();
 				// append new instance of the layout engine sub class.
 				$this->a_arr_sub_page_classes[ $l_obj_class->getPriority() ] = $l_obj_class;
diff --git a/class/dashboard/subpage-main.php b/class/layout/settings.php
similarity index 99%
rename from class/dashboard/subpage-main.php
rename to class/layout/settings.php
index f2387d1..e992b37 100644
--- a/class/dashboard/subpage-main.php
+++ b/class/layout/settings.php
@@ -49,7 +49,7 @@
  * @author Stefan Herndler
  * @since 1.5.0
  */
-class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
+class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_Layout_Engine {
 
 	/**
 	 * Returns a Priority index. Lower numbers have a higher Priority.