diff --git a/scss/framework-structure.scss b/scss/framework-structure.scss
index 2bfdd615c9..d4d51e9b6f 100755
--- a/scss/framework-structure.scss
+++ b/scss/framework-structure.scss
@@ -4,25 +4,18 @@
 // Components
 @import
   "framework/structure/base",
-  "framework/structure/accordion",
+  "framework/structure/bar",
   "framework/structure/button",
+  
+  
   "framework/structure/button-group",
-  "framework/structure/clearing",
-  "framework/structure/footer",
+
   "framework/structure/form",
   "framework/structure/grid",
-  "framework/structure/header",
+  
   "framework/structure/icon",
   "framework/structure/img",
-  "framework/structure/input-checkbox",
-  "framework/structure/input-radio",
-  "framework/structure/input-select",
-  "framework/structure/input-slider",
-  "framework/structure/input-text",
-  "framework/structure/label",
+
   "framework/structure/listview",
-  "framework/structure/table",
-  "framework/structure/thumb",
-  "framework/structure/transition",
-  "framework/structure/transition-slide",
-  "framework/structure/video";
+  "framework/structure/table";
+
diff --git a/scss/framework-theme-default.scss b/scss/framework-theme-default.scss
index 232ad9c73c..5476350567 100755
--- a/scss/framework-theme-default.scss
+++ b/scss/framework-theme-default.scss
@@ -4,16 +4,8 @@
 // Components
 @import
   "framework/theme/default/variables",
-  "framework/theme/default/accordion",
+  "framework/theme/default/bar",
   "framework/theme/default/button",
-  "framework/theme/default/footer",
-  "framework/theme/default/header",
   "framework/theme/default/icon",
-  "framework/theme/default/input-checkbox",
-  "framework/theme/default/input-radio",
-  "framework/theme/default/input-select",
-  "framework/theme/default/input-slider",
-  "framework/theme/default/input-text",
-  "framework/theme/default/label",
   "framework/theme/default/listview",
   "framework/theme/default/table";
diff --git a/scss/framework/structure/_bar.scss b/scss/framework/structure/_bar.scss
new file mode 100644
index 0000000000..06e0c0dc30
--- /dev/null
+++ b/scss/framework/structure/_bar.scss
@@ -0,0 +1,3 @@
+.bar {
+	
+}
\ No newline at end of file
diff --git a/scss/framework/structure/_clearing.scss b/scss/framework/structure/_clearing.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_footer.scss b/scss/framework/structure/_footer.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_header.scss b/scss/framework/structure/_header.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_input-checkbox.scss b/scss/framework/structure/_input-checkbox.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_input-radio.scss b/scss/framework/structure/_input-radio.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_input-select.scss b/scss/framework/structure/_input-select.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_input-slider.scss b/scss/framework/structure/_input-slider.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_input-text.scss b/scss/framework/structure/_input-text.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_thumb.scss b/scss/framework/structure/_thumb.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_transition-slide.scss b/scss/framework/structure/_transition-slide.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_transition.scss b/scss/framework/structure/_transition.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_video.scss b/scss/framework/structure/_video.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_accordion.scss b/scss/framework/theme/default/_accordion.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/structure/_accordion.scss b/scss/framework/theme/default/_bar.scss
similarity index 100%
rename from scss/framework/structure/_accordion.scss
rename to scss/framework/theme/default/_bar.scss
diff --git a/scss/framework/theme/default/_header.scss b/scss/framework/theme/default/_header.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_input-checkbox.scss b/scss/framework/theme/default/_input-checkbox.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_input-radio.scss b/scss/framework/theme/default/_input-radio.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_input-select.scss b/scss/framework/theme/default/_input-select.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_input-slider.scss b/scss/framework/theme/default/_input-slider.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_input-text.scss b/scss/framework/theme/default/_input-text.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/scss/framework/theme/default/_label.scss b/scss/framework/theme/default/_label.scss
deleted file mode 100644
index e69de29bb2..0000000000