diff --git a/layouts/components/ContentView.qml b/layouts/components/ContentView.qml
index 94de45d..8462807 100644
--- a/layouts/components/ContentView.qml
+++ b/layouts/components/ContentView.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls 1.4
 
 import Ikinuki.Client 1.0
 
+import "./ContentView"
+
 TabView {
     id: tabView
     property var providers
@@ -10,7 +12,8 @@ TabView {
     state: viewSelected ? "selected" : "deselected"
     property int xSelect: 0
     property int ySelect: 0
-    width: viewSelected ? parent.width * 0.95 : parent.width * 0.8
+    //width: viewSelected ? parent.width * 0.95 : parent.width * 0.8
+    width: parent.width * viewSelected ? 0.95 : 0.8
     height: parent.height
 
     property var maxElements: providers.length
@@ -28,14 +31,14 @@ TabView {
                     }
                     Column {
                         spacing: 20
-                        ContentViewElement {
+                        Element {
                             title: "In Progress"
                             provider: modelData
                             repeaterModel: modelData.inProgress
                             elemSelected: viewSelected && (0 == ySelect)
                             xIndex: xSelect
                         }
-                        ContentViewElement {
+                        Element {
                             title: "Recently Added"
                             provider: modelData
                             repeaterModel: modelData.recentlyAdded
diff --git a/layouts/components/ContentViewElement.qml b/layouts/components/ContentView/Element.qml
similarity index 93%
rename from layouts/components/ContentViewElement.qml
rename to layouts/components/ContentView/Element.qml
index e9f8173..ddb03e1 100644
--- a/layouts/components/ContentViewElement.qml
+++ b/layouts/components/ContentView/Element.qml
@@ -25,7 +25,7 @@ Column {
         Repeater {
             property var provider: modelData
             model: repeaterModel
-            ContentViewElementShow {
+            Show {
                 show: provider.getShow(modelData)
             }
         }
diff --git a/layouts/components/ContentViewElementShow.qml b/layouts/components/ContentView/Show.qml
similarity index 100%
rename from layouts/components/ContentViewElementShow.qml
rename to layouts/components/ContentView/Show.qml
diff --git a/layouts/components/ContentView/qmldir b/layouts/components/ContentView/qmldir
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/components/Sidebar.qml b/layouts/components/Sidebar.qml
index 8fdf6d1..aefa1e8 100644
--- a/layouts/components/Sidebar.qml
+++ b/layouts/components/Sidebar.qml
@@ -2,6 +2,8 @@ import QtQuick 2.12
 
 import Ikinuki.Client 1.0
 
+import "./Sidebar"
+
 Rectangle {
     id: rect
     property var providers
@@ -15,11 +17,11 @@ Rectangle {
     //color: "#0a3d4a"
     Column {
         anchors.fill: parent
-        SidebarHeader {}
+        Header {}
         Repeater {
             id: sidebarElements
             model: providers
-            SidebarElement {
+            Element {
                 provider: modelData
                 maximized: rect.maximized
                 selected: (index == selectedElement) ? true : false
diff --git a/layouts/components/SidebarElement.qml b/layouts/components/Sidebar/Element.qml
similarity index 100%
rename from layouts/components/SidebarElement.qml
rename to layouts/components/Sidebar/Element.qml
diff --git a/layouts/components/SidebarHeader.qml b/layouts/components/Sidebar/Header.qml
similarity index 100%
rename from layouts/components/SidebarHeader.qml
rename to layouts/components/Sidebar/Header.qml
diff --git a/layouts/components/Sidebar/qmldir b/layouts/components/Sidebar/qmldir
new file mode 100644
index 0000000..e69de29