diff --git a/libs/ui/figma.config.json b/libs/ui/figma.config.json
index ea45eb265..1fcc757d0 100644
--- a/libs/ui/figma.config.json
+++ b/libs/ui/figma.config.json
@@ -1,7 +1,7 @@
 {
   "codeConnect": {
     "parser": "react",
-    "include": ["src/**/figma/*.figma.tsx", "src/atoms/*.tsx", "src/molecules/*.tsx"],
+    "include": ["src/**/*.figma.tsx", "src/atoms/*.tsx", "src/molecules/*.tsx"],
     "importPaths": {
       "@libs/ui/*": "src/*"
     },
diff --git a/libs/ui/src/atoms/figma/badge.figma.tsx b/libs/ui/src/atoms/badge.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/badge.figma.tsx
rename to libs/ui/src/atoms/badge.figma.tsx
index b39ec7d97..749bbcacf 100644
--- a/libs/ui/src/atoms/figma/badge.figma.tsx
+++ b/libs/ui/src/atoms/badge.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Badge } from "../badge"
+import { Badge } from "./badge"
 
 figma.connect(
   Badge,
diff --git a/libs/ui/src/atoms/figma/button.figma.tsx b/libs/ui/src/atoms/button.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/button.figma.tsx
rename to libs/ui/src/atoms/button.figma.tsx
index c73d08e82..5bb8b3c76 100644
--- a/libs/ui/src/atoms/figma/button.figma.tsx
+++ b/libs/ui/src/atoms/button.figma.tsx
@@ -1,6 +1,6 @@
 import figma from "@figma/code-connect"
-import { Button } from "../button"
-import type { IconType } from "../icon"
+import { Button } from "./button"
+import type { IconType } from "./icon"
 
 figma.connect(
   Button,
diff --git a/libs/ui/src/atoms/figma/checkbox.figma.tsx b/libs/ui/src/atoms/checkbox.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/checkbox.figma.tsx
rename to libs/ui/src/atoms/checkbox.figma.tsx
index b7cc24e65..136447b09 100644
--- a/libs/ui/src/atoms/figma/checkbox.figma.tsx
+++ b/libs/ui/src/atoms/checkbox.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Checkbox } from "../checkbox"
+import { Checkbox } from "./checkbox"
 
 figma.connect(
   Checkbox,
diff --git a/libs/ui/src/atoms/figma/icon.figma.tsx b/libs/ui/src/atoms/icon.figma.tsx
similarity index 92%
rename from libs/ui/src/atoms/figma/icon.figma.tsx
rename to libs/ui/src/atoms/icon.figma.tsx
index 22f48f057..b16a42ac5 100644
--- a/libs/ui/src/atoms/figma/icon.figma.tsx
+++ b/libs/ui/src/atoms/icon.figma.tsx
@@ -1,6 +1,6 @@
 import figma from "@figma/code-connect"
-import type { IconType } from "../icon"
-import { Icon } from "../icon"
+import type { IconType } from "./icon"
+import { Icon } from "./icon"
 
 figma.connect(
   Icon,
diff --git a/libs/ui/src/atoms/figma/image.figma.tsx b/libs/ui/src/atoms/image.figma.tsx
similarity index 93%
rename from libs/ui/src/atoms/figma/image.figma.tsx
rename to libs/ui/src/atoms/image.figma.tsx
index ecabd5535..98d5e27e0 100644
--- a/libs/ui/src/atoms/figma/image.figma.tsx
+++ b/libs/ui/src/atoms/image.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Image } from "../image"
+import { Image } from "./image"
 
 figma.connect(
   Image,
diff --git a/libs/ui/src/atoms/figma/input.figma.tsx b/libs/ui/src/atoms/input.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/input.figma.tsx
rename to libs/ui/src/atoms/input.figma.tsx
index 4b76273a7..d0bd77f61 100644
--- a/libs/ui/src/atoms/figma/input.figma.tsx
+++ b/libs/ui/src/atoms/input.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Input } from "../input"
+import { Input } from "./input"
 
 figma.connect(
   Input,
diff --git a/libs/ui/src/atoms/figma/label.figma.tsx b/libs/ui/src/atoms/label.figma.tsx
similarity index 95%
rename from libs/ui/src/atoms/figma/label.figma.tsx
rename to libs/ui/src/atoms/label.figma.tsx
index 967323fd5..a597594b9 100644
--- a/libs/ui/src/atoms/figma/label.figma.tsx
+++ b/libs/ui/src/atoms/label.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Label } from "../label"
+import { Label } from "./label"
 
 figma.connect(
   Label,
diff --git a/libs/ui/src/atoms/figma/link-button.figma.tsx b/libs/ui/src/atoms/link-button.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/link-button.figma.tsx
rename to libs/ui/src/atoms/link-button.figma.tsx
index 86e0fbf3f..091ae691e 100644
--- a/libs/ui/src/atoms/figma/link-button.figma.tsx
+++ b/libs/ui/src/atoms/link-button.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { LinkButton } from "../link-button"
+import { LinkButton } from "./link-button"
 
 figma.connect(
   LinkButton,
diff --git a/libs/ui/src/atoms/figma/link.figma.tsx b/libs/ui/src/atoms/link.figma.tsx
similarity index 92%
rename from libs/ui/src/atoms/figma/link.figma.tsx
rename to libs/ui/src/atoms/link.figma.tsx
index f5c7bdef1..93dc12c19 100644
--- a/libs/ui/src/atoms/figma/link.figma.tsx
+++ b/libs/ui/src/atoms/link.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Link } from "../link"
+import { Link } from "./link"
 
 figma.connect(
   Link,
diff --git a/libs/ui/src/atoms/figma/numeric-input.figma.tsx b/libs/ui/src/atoms/numeric-input.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/numeric-input.figma.tsx
rename to libs/ui/src/atoms/numeric-input.figma.tsx
index 67eade30b..29b041ffb 100644
--- a/libs/ui/src/atoms/figma/numeric-input.figma.tsx
+++ b/libs/ui/src/atoms/numeric-input.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { NumericInput } from "../numeric-input"
+import { NumericInput } from "./numeric-input"
 
 figma.connect(
   NumericInput,
diff --git a/libs/ui/src/atoms/figma/rating.figma.tsx b/libs/ui/src/atoms/rating.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/rating.figma.tsx
rename to libs/ui/src/atoms/rating.figma.tsx
index 8a6e1079d..0872d5252 100644
--- a/libs/ui/src/atoms/figma/rating.figma.tsx
+++ b/libs/ui/src/atoms/rating.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Rating } from "../rating"
+import { Rating } from "./rating"
 
 figma.connect(
   Rating,
diff --git a/libs/ui/src/atoms/figma/skeleton.figma.tsx b/libs/ui/src/atoms/skeleton.figma.tsx
similarity index 98%
rename from libs/ui/src/atoms/figma/skeleton.figma.tsx
rename to libs/ui/src/atoms/skeleton.figma.tsx
index 2b7cae137..70f4f1e91 100644
--- a/libs/ui/src/atoms/figma/skeleton.figma.tsx
+++ b/libs/ui/src/atoms/skeleton.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Skeleton } from "../skeleton"
+import { Skeleton } from "./skeleton"
 
 const placeholderBgClassByVariant = {
   primary: "bg-skeleton-bg-primary",
diff --git a/libs/ui/src/atoms/figma/status-text.figma.tsx b/libs/ui/src/atoms/status-text.figma.tsx
similarity index 94%
rename from libs/ui/src/atoms/figma/status-text.figma.tsx
rename to libs/ui/src/atoms/status-text.figma.tsx
index 742442eae..08548489b 100644
--- a/libs/ui/src/atoms/figma/status-text.figma.tsx
+++ b/libs/ui/src/atoms/status-text.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { StatusText } from "../status-text"
+import { StatusText } from "./status-text"
 
 figma.connect(
   StatusText,
diff --git a/libs/ui/src/atoms/figma/textarea.figma.tsx b/libs/ui/src/atoms/textarea.figma.tsx
similarity index 96%
rename from libs/ui/src/atoms/figma/textarea.figma.tsx
rename to libs/ui/src/atoms/textarea.figma.tsx
index 8957d0a8f..1a4eecd11 100644
--- a/libs/ui/src/atoms/figma/textarea.figma.tsx
+++ b/libs/ui/src/atoms/textarea.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Textarea } from "../textarea"
+import { Textarea } from "./textarea"
 
 figma.connect(
   Textarea,
diff --git a/libs/ui/src/atoms/figma/tooltip.figma.tsx b/libs/ui/src/atoms/tooltip.figma.tsx
similarity index 94%
rename from libs/ui/src/atoms/figma/tooltip.figma.tsx
rename to libs/ui/src/atoms/tooltip.figma.tsx
index 041110947..0c5238dc0 100644
--- a/libs/ui/src/atoms/figma/tooltip.figma.tsx
+++ b/libs/ui/src/atoms/tooltip.figma.tsx
@@ -1,6 +1,6 @@
 import figma from "@figma/code-connect"
-import { Button } from "../button"
-import { Tooltip } from "../tooltip"
+import { Button } from "./button"
+import { Tooltip } from "./tooltip"
 
 figma.connect(
   Tooltip,
diff --git a/libs/ui/src/molecules/figma/accordion.figma.tsx b/libs/ui/src/molecules/accordion.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/accordion.figma.tsx
rename to libs/ui/src/molecules/accordion.figma.tsx
index 16e546c82..d7431bcbb 100644
--- a/libs/ui/src/molecules/figma/accordion.figma.tsx
+++ b/libs/ui/src/molecules/accordion.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Accordion } from "../accordion"
+import { Accordion } from "./accordion"
 
 figma.connect(
   Accordion,
diff --git a/libs/ui/src/molecules/figma/breadcrumb.figma.tsx b/libs/ui/src/molecules/breadcrumb.figma.tsx
similarity index 94%
rename from libs/ui/src/molecules/figma/breadcrumb.figma.tsx
rename to libs/ui/src/molecules/breadcrumb.figma.tsx
index aea97acba..7154ad83a 100644
--- a/libs/ui/src/molecules/figma/breadcrumb.figma.tsx
+++ b/libs/ui/src/molecules/breadcrumb.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Breadcrumb } from "../breadcrumb"
+import { Breadcrumb } from "./breadcrumb"
 
 figma.connect(
   Breadcrumb,
diff --git a/libs/ui/src/molecules/figma/carousel.figma.tsx b/libs/ui/src/molecules/carousel.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/carousel.figma.tsx
rename to libs/ui/src/molecules/carousel.figma.tsx
index aaa2405ad..7d810cb95 100644
--- a/libs/ui/src/molecules/figma/carousel.figma.tsx
+++ b/libs/ui/src/molecules/carousel.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Carousel } from "../carousel"
+import { Carousel } from "./carousel"
 
 figma.connect(
   Carousel,
diff --git a/libs/ui/src/molecules/figma/combobox.figma.tsx b/libs/ui/src/molecules/combobox.figma.tsx
similarity index 96%
rename from libs/ui/src/molecules/figma/combobox.figma.tsx
rename to libs/ui/src/molecules/combobox.figma.tsx
index a22e8ef9d..4f7cd81e5 100644
--- a/libs/ui/src/molecules/figma/combobox.figma.tsx
+++ b/libs/ui/src/molecules/combobox.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Combobox } from "../combobox"
+import { Combobox } from "./combobox"
 
 figma.connect(
   Combobox,
@@ -30,12 +30,12 @@ figma.connect(
     },
     example: ({ size, validateStatus, disabled, required }) => (
       <Combobox
-        size={size}
-        validateStatus={validateStatus}
         disabled={disabled}
-        required={required}
         items={[]}
         label="Label"
+        required={required}
+        size={size}
+        validateStatus={validateStatus}
       />
     ),
   }
diff --git a/libs/ui/src/molecules/figma/dialog.figma.tsx b/libs/ui/src/molecules/dialog.figma.tsx
similarity index 94%
rename from libs/ui/src/molecules/figma/dialog.figma.tsx
rename to libs/ui/src/molecules/dialog.figma.tsx
index c325d9277..c77016b28 100644
--- a/libs/ui/src/molecules/figma/dialog.figma.tsx
+++ b/libs/ui/src/molecules/dialog.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Dialog } from "../dialog"
+import { Dialog } from "./dialog"
 
 figma.connect(
   Dialog,
@@ -17,9 +17,9 @@ figma.connect(
     },
     example: ({ placement }) => (
       <Dialog
+        description="Description"
         placement={placement}
         title="Title"
-        description="Description"
         triggerText="Open"
       >
         Content
diff --git a/libs/ui/src/molecules/figma/form-checkbox.figma.tsx b/libs/ui/src/molecules/form-checkbox.figma.tsx
similarity index 96%
rename from libs/ui/src/molecules/figma/form-checkbox.figma.tsx
rename to libs/ui/src/molecules/form-checkbox.figma.tsx
index c293157a7..7d5e54bed 100644
--- a/libs/ui/src/molecules/figma/form-checkbox.figma.tsx
+++ b/libs/ui/src/molecules/form-checkbox.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { FormCheckbox } from "../form-checkbox"
+import { FormCheckbox } from "./form-checkbox"
 
 figma.connect(
   FormCheckbox,
diff --git a/libs/ui/src/molecules/figma/form-input.figma.tsx b/libs/ui/src/molecules/form-input.figma.tsx
similarity index 87%
rename from libs/ui/src/molecules/figma/form-input.figma.tsx
rename to libs/ui/src/molecules/form-input.figma.tsx
index 8707e2155..7ce2d6d23 100644
--- a/libs/ui/src/molecules/figma/form-input.figma.tsx
+++ b/libs/ui/src/molecules/form-input.figma.tsx
@@ -1,11 +1,13 @@
 import figma from "@figma/code-connect"
-import { FormInput } from "../form-input"
+import { FormInput } from "./form-input"
 
 figma.connect(
   FormInput,
   "https://www.figma.com/design/12xb1pqXKwE2vbOByN3ntg/New-Design-System-vol.-2?node-id=306-266",
   {
-    imports: ['import { FormInput } from "@techsio/ui-kit/molecules/form-input"'],
+    imports: [
+      'import { FormInput } from "@techsio/ui-kit/molecules/form-input"',
+    ],
     props: {
       size: figma.enum("size", {
         sm: "sm",
@@ -30,12 +32,12 @@ figma.connect(
     },
     example: ({ size, validateStatus, disabled, required }) => (
       <FormInput
+        disabled={disabled}
         id="field"
         label="Label"
+        required={required}
         size={size}
         validateStatus={validateStatus}
-        disabled={disabled}
-        required={required}
       />
     ),
   }
diff --git a/libs/ui/src/molecules/figma/form-numeric-input.figma.tsx b/libs/ui/src/molecules/form-numeric-input.figma.tsx
similarity index 88%
rename from libs/ui/src/molecules/figma/form-numeric-input.figma.tsx
rename to libs/ui/src/molecules/form-numeric-input.figma.tsx
index 17e351d1c..8b6e21607 100644
--- a/libs/ui/src/molecules/figma/form-numeric-input.figma.tsx
+++ b/libs/ui/src/molecules/form-numeric-input.figma.tsx
@@ -1,6 +1,6 @@
 import figma from "@figma/code-connect"
-import { NumericInput } from "../../atoms/numeric-input"
-import { FormNumericInput } from "../form-numeric-input"
+import { NumericInput } from "../atoms/numeric-input"
+import { FormNumericInput } from "./form-numeric-input"
 
 figma.connect(
   FormNumericInput,
@@ -45,19 +45,13 @@ figma.connect(
         readonly: true,
       }),
     },
-    example: ({
-      disabled,
-      readOnly,
-      required,
-      size,
-      validateStatus,
-    }) => (
+    example: ({ disabled, readOnly, required, size, validateStatus }) => (
       <FormNumericInput
-        id="quantity"
-        helpText="Enter value between 0-100"
-        label="Quantity"
         defaultValue={42}
         disabled={disabled}
+        helpText="Enter value between 0-100"
+        id="quantity"
+        label="Quantity"
         readOnly={readOnly}
         required={required}
         size={size}
diff --git a/libs/ui/src/molecules/figma/form-textarea.figma.tsx b/libs/ui/src/molecules/form-textarea.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/form-textarea.figma.tsx
rename to libs/ui/src/molecules/form-textarea.figma.tsx
index d3ded260c..7424a9697 100644
--- a/libs/ui/src/molecules/figma/form-textarea.figma.tsx
+++ b/libs/ui/src/molecules/form-textarea.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { FormTextarea } from "../form-textarea"
+import { FormTextarea } from "./form-textarea"
 
 figma.connect(
   FormTextarea,
@@ -32,12 +32,12 @@ figma.connect(
     },
     example: ({ size, validateStatus, disabled, required }) => (
       <FormTextarea
+        disabled={disabled}
         id="field"
         label="Label"
+        required={required}
         size={size}
         validateStatus={validateStatus}
-        disabled={disabled}
-        required={required}
       />
     ),
   }
diff --git a/libs/ui/src/molecules/figma/menu.figma.tsx b/libs/ui/src/molecules/menu.figma.tsx
similarity index 94%
rename from libs/ui/src/molecules/figma/menu.figma.tsx
rename to libs/ui/src/molecules/menu.figma.tsx
index a153270d0..794443082 100644
--- a/libs/ui/src/molecules/figma/menu.figma.tsx
+++ b/libs/ui/src/molecules/menu.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Menu } from "../menu"
+import { Menu } from "./menu"
 
 figma.connect(
   Menu,
diff --git a/libs/ui/src/molecules/figma/pagination.figma.tsx b/libs/ui/src/molecules/pagination.figma.tsx
similarity index 92%
rename from libs/ui/src/molecules/figma/pagination.figma.tsx
rename to libs/ui/src/molecules/pagination.figma.tsx
index 3ed76e28e..a341a12de 100644
--- a/libs/ui/src/molecules/figma/pagination.figma.tsx
+++ b/libs/ui/src/molecules/pagination.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Pagination } from "../pagination"
+import { Pagination } from "./pagination"
 
 figma.connect(
   Pagination,
diff --git a/libs/ui/src/molecules/figma/phone-input.figma.tsx b/libs/ui/src/molecules/phone-input.figma.tsx
similarity index 97%
rename from libs/ui/src/molecules/figma/phone-input.figma.tsx
rename to libs/ui/src/molecules/phone-input.figma.tsx
index d40d4227c..b30b4b595 100644
--- a/libs/ui/src/molecules/figma/phone-input.figma.tsx
+++ b/libs/ui/src/molecules/phone-input.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { PhoneInput } from "../phone-input"
+import { PhoneInput } from "./phone-input"
 
 figma.connect(
   PhoneInput,
diff --git a/libs/ui/src/molecules/figma/popover.figma.tsx b/libs/ui/src/molecules/popover.figma.tsx
similarity index 96%
rename from libs/ui/src/molecules/figma/popover.figma.tsx
rename to libs/ui/src/molecules/popover.figma.tsx
index 87c01f395..dc87b142b 100644
--- a/libs/ui/src/molecules/figma/popover.figma.tsx
+++ b/libs/ui/src/molecules/popover.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Popover } from "../popover"
+import { Popover } from "./popover"
 
 figma.connect(
   Popover,
diff --git a/libs/ui/src/molecules/figma/product-card.figma.tsx b/libs/ui/src/molecules/product-card.figma.tsx
similarity index 94%
rename from libs/ui/src/molecules/figma/product-card.figma.tsx
rename to libs/ui/src/molecules/product-card.figma.tsx
index 681f56b81..6c15a67a6 100644
--- a/libs/ui/src/molecules/figma/product-card.figma.tsx
+++ b/libs/ui/src/molecules/product-card.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { ProductCard } from "../product-card"
+import { ProductCard } from "./product-card"
 
 figma.connect(
   ProductCard,
diff --git a/libs/ui/src/molecules/figma/radio-card.figma.tsx b/libs/ui/src/molecules/radio-card.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/radio-card.figma.tsx
rename to libs/ui/src/molecules/radio-card.figma.tsx
index bb7f20870..de1749f91 100644
--- a/libs/ui/src/molecules/figma/radio-card.figma.tsx
+++ b/libs/ui/src/molecules/radio-card.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { RadioCard } from "../radio-card"
+import { RadioCard } from "./radio-card"
 
 figma.connect(
   RadioCard,
diff --git a/libs/ui/src/molecules/figma/radio-group.figma.tsx b/libs/ui/src/molecules/radio-group.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/radio-group.figma.tsx
rename to libs/ui/src/molecules/radio-group.figma.tsx
index 3b691c54f..58aba4347 100644
--- a/libs/ui/src/molecules/figma/radio-group.figma.tsx
+++ b/libs/ui/src/molecules/radio-group.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { RadioGroup } from "../radio-group"
+import { RadioGroup } from "./radio-group"
 
 figma.connect(
   RadioGroup,
diff --git a/libs/ui/src/molecules/figma/search-form.figma.tsx b/libs/ui/src/molecules/search-form.figma.tsx
similarity index 92%
rename from libs/ui/src/molecules/figma/search-form.figma.tsx
rename to libs/ui/src/molecules/search-form.figma.tsx
index 729a42ca3..8e580c404 100644
--- a/libs/ui/src/molecules/figma/search-form.figma.tsx
+++ b/libs/ui/src/molecules/search-form.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { SearchForm } from "../search-form"
+import { SearchForm } from "./search-form"
 
 figma.connect(
   SearchForm,
diff --git a/libs/ui/src/molecules/figma/select.figma.tsx b/libs/ui/src/molecules/select.figma.tsx
similarity index 97%
rename from libs/ui/src/molecules/figma/select.figma.tsx
rename to libs/ui/src/molecules/select.figma.tsx
index 761e0bcaf..ca90a68ba 100644
--- a/libs/ui/src/molecules/figma/select.figma.tsx
+++ b/libs/ui/src/molecules/select.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Select } from "../select"
+import { Select } from "./select"
 
 figma.connect(
   Select,
@@ -33,11 +33,11 @@ figma.connect(
     },
     example: ({ size, validateStatus, disabled, required }) => (
       <Select
-        size={size}
-        validateStatus={validateStatus}
         disabled={disabled}
-        required={required}
         items={[]}
+        required={required}
+        size={size}
+        validateStatus={validateStatus}
       >
         <Select.Label>Label</Select.Label>
         <Select.Trigger />
diff --git a/libs/ui/src/molecules/figma/slider.figma.tsx b/libs/ui/src/molecules/slider.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/slider.figma.tsx
rename to libs/ui/src/molecules/slider.figma.tsx
index dd4dc74d1..ec9fb2229 100644
--- a/libs/ui/src/molecules/figma/slider.figma.tsx
+++ b/libs/ui/src/molecules/slider.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Slider } from "../slider"
+import { Slider } from "./slider"
 
 figma.connect(
   Slider,
@@ -20,12 +20,12 @@ figma.connect(
     },
     example: ({ size, disabled, validateStatus }) => (
       <Slider
-        size={size}
+        defaultValue={[50]}
         disabled={disabled}
-        validateStatus={validateStatus}
-        min={0}
         max={100}
-        defaultValue={[50]}
+        min={0}
+        size={size}
+        validateStatus={validateStatus}
       />
     ),
   }
diff --git a/libs/ui/src/molecules/figma/steps.figma.tsx b/libs/ui/src/molecules/steps.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/steps.figma.tsx
rename to libs/ui/src/molecules/steps.figma.tsx
index 9dcda207a..87c519577 100644
--- a/libs/ui/src/molecules/figma/steps.figma.tsx
+++ b/libs/ui/src/molecules/steps.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Steps } from "../steps"
+import { Steps } from "./steps"
 
 figma.connect(
   Steps,
diff --git a/libs/ui/src/molecules/figma/switch.figma.tsx b/libs/ui/src/molecules/switch.figma.tsx
similarity index 96%
rename from libs/ui/src/molecules/figma/switch.figma.tsx
rename to libs/ui/src/molecules/switch.figma.tsx
index 3032299c7..427d84e8b 100644
--- a/libs/ui/src/molecules/figma/switch.figma.tsx
+++ b/libs/ui/src/molecules/switch.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Switch } from "../switch"
+import { Switch } from "./switch"
 
 figma.connect(
   Switch,
diff --git a/libs/ui/src/molecules/figma/tabs.figma.tsx b/libs/ui/src/molecules/tabs.figma.tsx
similarity index 96%
rename from libs/ui/src/molecules/figma/tabs.figma.tsx
rename to libs/ui/src/molecules/tabs.figma.tsx
index 8d7ecc2ca..ee15231e1 100644
--- a/libs/ui/src/molecules/figma/tabs.figma.tsx
+++ b/libs/ui/src/molecules/tabs.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Tabs } from "../tabs"
+import { Tabs } from "./tabs"
 
 figma.connect(
   Tabs,
diff --git a/libs/ui/src/molecules/figma/toast.figma.tsx b/libs/ui/src/molecules/toast.figma.tsx
similarity index 95%
rename from libs/ui/src/molecules/figma/toast.figma.tsx
rename to libs/ui/src/molecules/toast.figma.tsx
index 058a3249e..099ef64a2 100644
--- a/libs/ui/src/molecules/figma/toast.figma.tsx
+++ b/libs/ui/src/molecules/toast.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { Toaster, useToast } from "../toast"
+import { Toaster, useToast } from "./toast"
 
 figma.connect(
   Toaster,
diff --git a/libs/ui/src/molecules/figma/tree-view.figma.tsx b/libs/ui/src/molecules/tree-view.figma.tsx
similarity index 93%
rename from libs/ui/src/molecules/figma/tree-view.figma.tsx
rename to libs/ui/src/molecules/tree-view.figma.tsx
index e222be0b7..3fbdd8187 100644
--- a/libs/ui/src/molecules/figma/tree-view.figma.tsx
+++ b/libs/ui/src/molecules/tree-view.figma.tsx
@@ -1,5 +1,5 @@
 import figma from "@figma/code-connect"
-import { TreeView } from "../tree-view"
+import { TreeView } from "./tree-view"
 
 figma.connect(
   TreeView,
@@ -15,7 +15,6 @@ figma.connect(
     },
     example: ({ size }) => (
       <TreeView
-        size={size}
         data={[
           {
             id: "1",
@@ -23,6 +22,7 @@ figma.connect(
             children: [{ id: "1-1", name: "Child" }],
           },
         ]}
+        size={size}
       />
     ),
   }