diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86c82cd7..ede3215f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@
 ### BREAKING
 
 * `bulma` folder renamed to `sass` to avoid the redundant `bulma/bulma` path
+* `variables.sass` moved to `/utilities`
+* almost everything is singular now
+* **elements** only have one class
+* **components** have at least one sub-class
+* `.content` moved to elements
+* `.table` moved to elements
+* `.message` moved to components
+* `.table-icon`, `.table-link`, `.table-narrow` are now called `.is-icon`, `.is-link`, `.is-narrow`
+
+### Added
+
+* all variables are now `!default` so you can set your custom variables before importing Bulma
 
 ## 0.0.22
 
diff --git a/sass/base/base.sass b/sass/base/base.sass
index 74209c01..7346c0ca 100644
--- a/sass/base/base.sass
+++ b/sass/base/base.sass
@@ -1,6 +1,5 @@
 @charset "utf-8"
 
 @import "generic"
-@import "content"
-@import "highlight"
 @import "helpers"
+@import "highlight"
diff --git a/sass/components/components.sass b/sass/components/components.sass
index 9caf620a..0e0445d6 100644
--- a/sass/components/components.sass
+++ b/sass/components/components.sass
@@ -1,15 +1,15 @@
 @charset "utf-8"
 
-@import "grid"
-@import "navbar"
 @import "card"
-@import "table"
-@import "tabs"
+@import "grid"
 @import "media"
 @import "menu"
+@import "message"
+@import "modal"
+@import "navbar"
 @import "pagination"
 @import "panel"
-@import "modal"
+@import "tabs"
 
 .box
   @extend .block
diff --git a/sass/elements/messages.sass b/sass/components/message.sass
similarity index 100%
rename from sass/elements/messages.sass
rename to sass/components/message.sass
diff --git a/sass/elements/buttons.sass b/sass/elements/button.sass
similarity index 100%
rename from sass/elements/buttons.sass
rename to sass/elements/button.sass
diff --git a/sass/base/content.sass b/sass/elements/content.sass
similarity index 100%
rename from sass/base/content.sass
rename to sass/elements/content.sass
diff --git a/sass/elements/elements.sass b/sass/elements/elements.sass
index 437ab999..74b96334 100644
--- a/sass/elements/elements.sass
+++ b/sass/elements/elements.sass
@@ -1,12 +1,14 @@
 @charset "utf-8"
 
 @import "controls"
-@import "buttons"
-@import "titles"
-@import "images"
-@import "messages"
-@import "notifications"
+
+@import "button"
+@import "content"
+@import "image"
+@import "notification"
 @import "progress"
+@import "table"
+@import "title"
 
 .delete
   +unselectable
diff --git a/sass/elements/images.sass b/sass/elements/image.sass
similarity index 100%
rename from sass/elements/images.sass
rename to sass/elements/image.sass
diff --git a/sass/elements/notifications.sass b/sass/elements/notification.sass
similarity index 100%
rename from sass/elements/notifications.sass
rename to sass/elements/notification.sass
diff --git a/sass/components/table.sass b/sass/elements/table.sass
similarity index 91%
rename from sass/components/table.sass
rename to sass/elements/table.sass
index 47bfeb64..1f994939 100644
--- a/sass/components/table.sass
+++ b/sass/elements/table.sass
@@ -10,18 +10,18 @@
     padding: 8px 10px
     vertical-align: top
     // Modifiers
-    &.table-icon
+    &.is-icon
       padding: 5px
       text-align: center
       white-space: nowrap
       width: 1%
       .fa
         +fa(21px, 24px)
-      &.table-link
+      &.is-link
         padding: 0
         & > a
           padding: 5px
-    &.table-link
+    &.is-link
       padding: 0
       & > a
         display: block
@@ -29,7 +29,7 @@
         &:hover
           background: $link
           color: $link-invert
-    &.table-narrow
+    &.is-narrow
       white-space: nowrap
       width: 1%
   th
@@ -70,13 +70,13 @@
     th
       padding: 5px 10px
       // Modifiers
-      &.table-icon
+      &.is-icon
         padding: 2px
-        &.table-link
+        &.is-link
           padding: 0
           & > a
             padding: 2px
-      &.table-link
+      &.is-link
         padding: 0
         & > a
           padding: 5px 10px
diff --git a/sass/elements/titles.sass b/sass/elements/title.sass
similarity index 100%
rename from sass/elements/titles.sass
rename to sass/elements/title.sass