diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_border_radius.scss b/playbook/app/pb_kits/playbook/tokens/exports/_border_radius.scss
deleted file mode 100755
index aa77ba94cc..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_border_radius.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../border_radius";
-
-:export {
-  @mixin export_border_radius($border_radius_list) {
-    @each $name, $size in $border_radius_list {
-      #{$name}: $size;
-    }
-  }
-  @include export_border_radius($border_radius);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_colors.scss b/playbook/app/pb_kits/playbook/tokens/exports/_colors.scss
deleted file mode 100755
index d0ca8b1757..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_colors.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@import "../colors";
-
-:export {
-  @mixin export-colors($colors-list) {
-    @each $name, $color in $colors-list {
-      #{$name}: $color;
-    }
-  }
-  @include export-colors($product_colors);
-  @include export-colors($status_colors);
-  @include export-colors($data_colors);
-  @include export-colors($shadow_colors);
-  @include export-colors($colors);
-  @include export-colors($interface_colors);
-  @include export-colors($main_colors);
-  @include export-colors($background_colors);
-  @include export-colors($card_colors);
-  @include export-colors($active_colors);
-  @include export-colors($action_colors);
-  @include export-colors($hover_colors);
-  @include export-colors($border_colors);
-  @include export-colors($text_colors);
-  @include export-colors($category_colors);
-  gradient_start: $gradient_start;
-  gradient_end: $gradient_end;
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_line_height.scss b/playbook/app/pb_kits/playbook/tokens/exports/_line_height.scss
deleted file mode 100755
index 4afd919d7f..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_line_height.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../line_height";
-
-:export {
-  @mixin export_line_height($line_height_list) {
-    @each $name, $settings in $line_height_list {
-      #{$name}: $settings;
-    }
-  }
-  @include export_line_height($line_height);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_opacity.scss b/playbook/app/pb_kits/playbook/tokens/exports/_opacity.scss
deleted file mode 100755
index 1b11d75f05..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_opacity.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../opacity";
-
-:export {
-  @mixin export_opacity($opacity_list) {
-    @each $name, $settings in $opacity_list {
-      #{$name}: $settings;
-    }
-  }
-  @include export_opacity($opacity);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_positioning.scss b/playbook/app/pb_kits/playbook/tokens/exports/_positioning.scss
deleted file mode 100755
index e9bdca20f4..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_positioning.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../positioning";
-
-:export {
-  @mixin export_z_index($z_index_list) {
-    @each $name, $settings in $z_index_list {
-      #{$name}: $settings;
-    }
-  }
-  @include export_z_index($z_index);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_scale.scss b/playbook/app/pb_kits/playbook/tokens/exports/_scale.scss
deleted file mode 100644
index a6459ec884..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_scale.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import "../scale";
-
-:export {
-  @mixin export-hover-scale-classes($scales-list) {
-    @each $name, $scale in $scales-list {
-      .hover_#{$name}:hover {
-        transform: $scale;
-      }
-    }
-  }
-  
-  @include export-hover-scale-classes($scales);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_screen_sizes.scss b/playbook/app/pb_kits/playbook/tokens/exports/_screen_sizes.scss
deleted file mode 100755
index 6427008053..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_screen_sizes.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../screen_sizes";
-
-:export {
-  @mixin export_breakpoints($breakpoints_list) {
-    @each $name, $settings in $breakpoints_list {
-      #{$name}: $settings;
-    }
-  }
-  @include export_breakpoints($breakpoints);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_shadows.scss b/playbook/app/pb_kits/playbook/tokens/exports/_shadows.scss
deleted file mode 100755
index b4a2137e46..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_shadows.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../shadows";
-
-:export {
-  @mixin export_shadows($shadows_list) {
-    @each $name, $settings in $shadows_list {
-      #{$name}: $settings;
-    }
-  }
-  @include export_shadows($box_shadows);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_spacing.scss b/playbook/app/pb_kits/playbook/tokens/exports/_spacing.scss
deleted file mode 100755
index 06dc2d27d5..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_spacing.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import "../spacing";
-
-:export {
-  @mixin export_spacing($spacing_list) {
-    @each $name, $size in $spacing_list {
-      #{$name}: $size;
-    }
-  }
-  @include export_spacing($spaces);
-}
diff --git a/playbook/app/pb_kits/playbook/tokens/exports/_typography.scss b/playbook/app/pb_kits/playbook/tokens/exports/_typography.scss
deleted file mode 100755
index 63ff6f1d62..0000000000
--- a/playbook/app/pb_kits/playbook/tokens/exports/_typography.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import "../typography";
-
-:export {
-  font_family_base: $font_family_base;
-  text_jumbo: $text_jumbo;
-  text_largest: $text_largest;
-  text_larger: $text_larger;
-  text_large: $text_large;
-  text_base: $text_base;
-  text_default: $text_default;
-  text_normal: $text_normal;
-  text_medium: $text_medium;
-  text_small: $text_small;
-  text_smaller: $text_smaller;
-  text_smallest: $text_smallest;
-  heading_1: $heading_1;
-  heading_2: $heading_2;
-  heading_3: $heading_3;
-  heading_4: $heading_4;
-  lighter: $lighter;
-  light: $light;
-  bold: $bold;
-  regular: $regular;
-}
diff --git a/playbook/app/pb_kits/playbook/utilities/_hover.scss b/playbook/app/pb_kits/playbook/utilities/_hover.scss
index 7ffdaa03ff..853d835123 100644
--- a/playbook/app/pb_kits/playbook/utilities/_hover.scss
+++ b/playbook/app/pb_kits/playbook/utilities/_hover.scss
@@ -1,4 +1,4 @@
-@import "../tokens/exports/scale";
+@import "../tokens/exports/scale.module";
 
 @mixin hover-color-classes($colors-list) {
     @each $name, $color in $colors-list {
diff --git a/playbook/app/pb_kits/playbook/utilities/_line_height.scss b/playbook/app/pb_kits/playbook/utilities/_line_height.scss
index abc7e35c38..47fcbb1324 100644
--- a/playbook/app/pb_kits/playbook/utilities/_line_height.scss
+++ b/playbook/app/pb_kits/playbook/utilities/_line_height.scss
@@ -1,4 +1,4 @@
-@import "../tokens/exports/line_height";
+@import "../tokens/exports/line_height.module";
 
 @mixin line-height-classes($line-height-list) {
   @each $name, $line-height in $line-height-list {
diff --git a/playbook/app/pb_kits/playbook/utilities/_shadow.scss b/playbook/app/pb_kits/playbook/utilities/_shadow.scss
index dfdbc8061f..0f3c55fe1e 100644
--- a/playbook/app/pb_kits/playbook/utilities/_shadow.scss
+++ b/playbook/app/pb_kits/playbook/utilities/_shadow.scss
@@ -1,4 +1,4 @@
-@import "../tokens/exports/shadows";
+@import "../tokens/exports/shadows.module";
 
 @mixin shadow-classes($shadows-list) {
   @each $name, $shadow in $shadows-list {