diff --git a/scss/framework.scss b/scss/framework.scss
index 60bffeeffe..875542d232 100755
--- a/scss/framework.scss
+++ b/scss/framework.scss
@@ -1,43 +1,40 @@
 @charset "UTF-8";
 
-// This includes all of the framework global elements that are needed to work with any of the other files.
-@import "foundation/variables";
-
-// Foundation Components
+// Framework Components
 @import
   ""
-  "foundation/components/global",
-  "foundation/components/grid",
-  "foundation/components/visibility",
-  "foundation/components/block-grid",
-  "foundation/components/type",
-  "foundation/components/buttons",
-  "foundation/components/forms",
-  "foundation/components/button-groups",
-  "foundation/components/dropdown-buttons",
-  "foundation/components/split-buttons",
-  "foundation/components/flex-video",
-  "foundation/components/section",
-  "foundation/components/top-bar",
-  "foundation/components/orbit",
-  "foundation/components/reveal",
-  "foundation/components/joyride",
-  "foundation/components/clearing",
-  "foundation/components/alert-boxes",
-  "foundation/components/breadcrumbs",
-  "foundation/components/custom-forms",
-  "foundation/components/keystrokes",
-  "foundation/components/labels",
-  "foundation/components/inline-lists",
-  "foundation/components/pagination",
-  "foundation/components/panels",
-  "foundation/components/pricing-tables",
-  "foundation/components/progress-bars",
-  "foundation/components/side-nav",
-  "foundation/components/sub-nav",
-  "foundation/components/switch",
-  "foundation/components/magellan",
-  "foundation/components/tables",
-  "foundation/components/thumbs",
-  "foundation/components/tooltips",
-  "foundation/components/dropdown";
\ No newline at end of file
+  "framework/components/global",
+  "framework/components/grid",
+  "framework/components/visibility",
+  "framework/components/block-grid",
+  "framework/components/type",
+  "framework/components/buttons",
+  "framework/components/forms",
+  "framework/components/button-groups",
+  "framework/components/dropdown-buttons",
+  "framework/components/split-buttons",
+  "framework/components/flex-video",
+  "framework/components/section",
+  "framework/components/top-bar",
+  "framework/components/orbit",
+  "framework/components/reveal",
+  "framework/components/joyride",
+  "framework/components/clearing",
+  "framework/components/alert-boxes",
+  "framework/components/breadcrumbs",
+  "framework/components/custom-forms",
+  "framework/components/keystrokes",
+  "framework/components/labels",
+  "framework/components/inline-lists",
+  "framework/components/pagination",
+  "framework/components/panels",
+  "framework/components/pricing-tables",
+  "framework/components/progress-bars",
+  "framework/components/side-nav",
+  "framework/components/sub-nav",
+  "framework/components/switch",
+  "framework/components/magellan",
+  "framework/components/tables",
+  "framework/components/thumbs",
+  "framework/components/tooltips",
+  "framework/components/dropdown";
\ No newline at end of file
diff --git a/scss/framework/components/_accordion.scss b/scss/framework/structure/_accordion.scss
similarity index 100%
rename from scss/framework/components/_accordion.scss
rename to scss/framework/structure/_accordion.scss
diff --git a/scss/framework/components/_button-group.scss b/scss/framework/structure/_button-group.scss
similarity index 100%
rename from scss/framework/components/_button-group.scss
rename to scss/framework/structure/_button-group.scss
diff --git a/scss/framework/components/_button.scss b/scss/framework/structure/_button.scss
similarity index 100%
rename from scss/framework/components/_button.scss
rename to scss/framework/structure/_button.scss
diff --git a/scss/framework/components/_clearing.scss b/scss/framework/structure/_clearing.scss
similarity index 100%
rename from scss/framework/components/_clearing.scss
rename to scss/framework/structure/_clearing.scss
diff --git a/scss/framework/components/_footer.scss b/scss/framework/structure/_footer.scss
similarity index 100%
rename from scss/framework/components/_footer.scss
rename to scss/framework/structure/_footer.scss
diff --git a/scss/framework/components/_form.scss b/scss/framework/structure/_form.scss
similarity index 100%
rename from scss/framework/components/_form.scss
rename to scss/framework/structure/_form.scss
diff --git a/scss/framework/components/_grid.scss b/scss/framework/structure/_grid.scss
similarity index 100%
rename from scss/framework/components/_grid.scss
rename to scss/framework/structure/_grid.scss
diff --git a/scss/framework/components/_header.scss b/scss/framework/structure/_header.scss
similarity index 100%
rename from scss/framework/components/_header.scss
rename to scss/framework/structure/_header.scss
diff --git a/scss/framework/components/_icon.scss b/scss/framework/structure/_icon.scss
similarity index 100%
rename from scss/framework/components/_icon.scss
rename to scss/framework/structure/_icon.scss
diff --git a/scss/framework/components/_img.scss b/scss/framework/structure/_img.scss
similarity index 100%
rename from scss/framework/components/_img.scss
rename to scss/framework/structure/_img.scss
diff --git a/scss/framework/components/_input-checkbox.scss b/scss/framework/structure/_input-checkbox.scss
similarity index 100%
rename from scss/framework/components/_input-checkbox.scss
rename to scss/framework/structure/_input-checkbox.scss
diff --git a/scss/framework/components/_input-radio.scss b/scss/framework/structure/_input-radio.scss
similarity index 100%
rename from scss/framework/components/_input-radio.scss
rename to scss/framework/structure/_input-radio.scss
diff --git a/scss/framework/components/_input-select.scss b/scss/framework/structure/_input-select.scss
similarity index 100%
rename from scss/framework/components/_input-select.scss
rename to scss/framework/structure/_input-select.scss
diff --git a/scss/framework/components/_input-slider.scss b/scss/framework/structure/_input-slider.scss
similarity index 100%
rename from scss/framework/components/_input-slider.scss
rename to scss/framework/structure/_input-slider.scss
diff --git a/scss/framework/components/_input-text.scss b/scss/framework/structure/_input-text.scss
similarity index 100%
rename from scss/framework/components/_input-text.scss
rename to scss/framework/structure/_input-text.scss
diff --git a/scss/framework/components/_label.scss b/scss/framework/structure/_label.scss
similarity index 100%
rename from scss/framework/components/_label.scss
rename to scss/framework/structure/_label.scss
diff --git a/scss/framework/components/_table.scss b/scss/framework/structure/_listview.scss
similarity index 100%
rename from scss/framework/components/_table.scss
rename to scss/framework/structure/_listview.scss
diff --git a/scss/framework/components/_thumb.scss b/scss/framework/structure/_table.scss
similarity index 100%
rename from scss/framework/components/_thumb.scss
rename to scss/framework/structure/_table.scss
diff --git a/scss/framework/components/_transition-slide.scss b/scss/framework/structure/_thumb.scss
similarity index 100%
rename from scss/framework/components/_transition-slide.scss
rename to scss/framework/structure/_thumb.scss
diff --git a/scss/framework/components/_transition.scss b/scss/framework/structure/_transition-slide.scss
similarity index 100%
rename from scss/framework/components/_transition.scss
rename to scss/framework/structure/_transition-slide.scss
diff --git a/scss/framework/components/_video.scss b/scss/framework/structure/_transition.scss
similarity index 100%
rename from scss/framework/components/_video.scss
rename to scss/framework/structure/_transition.scss
diff --git a/scss/framework/structure/_video.scss b/scss/framework/structure/_video.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_accordion.scss b/scss/framework/theme/default/_accordion.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_button.scss b/scss/framework/theme/default/_button.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_footer.scss b/scss/framework/theme/default/_footer.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_header.scss b/scss/framework/theme/default/_header.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_input-checkbox.scss b/scss/framework/theme/default/_input-checkbox.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_input-radio.scss b/scss/framework/theme/default/_input-radio.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_input-select.scss b/scss/framework/theme/default/_input-select.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_input-slider.scss b/scss/framework/theme/default/_input-slider.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_input-text.scss b/scss/framework/theme/default/_input-text.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_label.scss b/scss/framework/theme/default/_label.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_listview.scss b/scss/framework/theme/default/_listview.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scss/framework/theme/default/_table.scss b/scss/framework/theme/default/_table.scss
new file mode 100644
index 0000000000..e69de29bb2