diff --git a/src/core/container.css b/src/core/container.css
new file mode 100644
index 0000000..13bb6bb
--- /dev/null
+++ b/src/core/container.css
@@ -0,0 +1,37 @@
+/**
+ * @package @comfortcss/flex
+ * @since 0.1.0
+ * @license MIT
+ * @author ComfortCSS
+ *
+ * @section container
+ * @description
+ *   Classes that create flex containers.
+ *   This is the foundation of the flex system.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/display
+ */
+
+@layer flex {
+    /**
+     * Block-level flex container.
+     * Creates a flex formatting context.
+     *
+     * @example
+     *   <div class="flex">...</div>
+     */
+    :where(.flex) {
+        display: flex;
+    }
+
+    /**
+     * Inline-level flex container.
+     * Behaves like inline element but with flex children.
+     *
+     * @example
+     *   <span class="inline-flex">...</span>
+     */
+    :where(.inline-flex) {
+        display: inline-flex;
+    }
+}
diff --git a/src/flex.css b/src/flex.css
index 8b84db6..e395565 100644
--- a/src/flex.css
+++ b/src/flex.css
@@ -1,35 +1,10 @@
 /**
  * @package @comfortcss/flex
- * @since 0.1.0
+ * @version 0.1.0
+ * @license MIT
+ * @author ComfortCSS
  *
- * @section container
- * @description
- *   Classes that create flex containers.
- *   This is the foundation of the flex system.
- *
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/display
+ * @dependencies @comfortcss/tokens
  */
 
-@layer flex {
-    /**
-     * Block-level flex container.
-     * Creates a flex formatting context.
-     *
-     * @example
-     *   <div class="flex">...</div>
-     */
-    :where(.flex) {
-        display: flex;
-    }
-
-    /**
-     * Inline-level flex container.
-     * Behaves like inline element but with flex children.
-     *
-     * @example
-     *   <span class="inline-flex">...</span>
-     */
-    :where(.inline-flex) {
-        display: inline-flex;
-    }
-}
+@import "./core/container.css";
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index e69de29..12a793b 100644
--- a/src/index.css
+++ b/src/index.css
@@ -0,0 +1,10 @@
+/**
+ * @package @comfortcss/flex
+ * @version 0.1.0
+ * @license MIT
+ * @author ComfortCSS
+ *
+ * @dependencies @comfortcss/tokens
+ */
+
+@import "./flex.css";
\ No newline at end of file