diff --git a/apps/web-app/app/components/form/CreateChannelPaymentMethod.vue b/apps/web-app/app/components/Form/CreateChannelPaymentMethod.vue
similarity index 100%
rename from apps/web-app/app/components/form/CreateChannelPaymentMethod.vue
rename to apps/web-app/app/components/Form/CreateChannelPaymentMethod.vue
diff --git a/apps/web-app/app/components/form/CreateMenu.vue b/apps/web-app/app/components/Form/CreateMenu.vue
similarity index 100%
rename from apps/web-app/app/components/form/CreateMenu.vue
rename to apps/web-app/app/components/Form/CreateMenu.vue
diff --git a/apps/web-app/app/components/form/CreateMenuCategory.vue b/apps/web-app/app/components/Form/CreateMenuCategory.vue
similarity index 100%
rename from apps/web-app/app/components/form/CreateMenuCategory.vue
rename to apps/web-app/app/components/Form/CreateMenuCategory.vue
diff --git a/apps/web-app/app/components/form/CreateProduct.vue b/apps/web-app/app/components/Form/CreateProduct.vue
similarity index 100%
rename from apps/web-app/app/components/form/CreateProduct.vue
rename to apps/web-app/app/components/Form/CreateProduct.vue
diff --git a/apps/web-app/app/components/form/CreateProductVariant.vue b/apps/web-app/app/components/Form/CreateProductVariant.vue
similarity index 100%
rename from apps/web-app/app/components/form/CreateProductVariant.vue
rename to apps/web-app/app/components/Form/CreateProductVariant.vue
diff --git a/apps/web-app/app/components/form/CreateWarehouse.vue b/apps/web-app/app/components/Form/CreateWarehouse.vue
similarity index 100%
rename from apps/web-app/app/components/form/CreateWarehouse.vue
rename to apps/web-app/app/components/Form/CreateWarehouse.vue
diff --git a/apps/web-app/app/components/form/DeleteChannelPaymentMethod.vue b/apps/web-app/app/components/Form/DeleteChannelPaymentMethod.vue
similarity index 100%
rename from apps/web-app/app/components/form/DeleteChannelPaymentMethod.vue
rename to apps/web-app/app/components/Form/DeleteChannelPaymentMethod.vue
diff --git a/apps/web-app/app/components/form/DeleteProduct.vue b/apps/web-app/app/components/Form/DeleteProduct.vue
similarity index 100%
rename from apps/web-app/app/components/form/DeleteProduct.vue
rename to apps/web-app/app/components/Form/DeleteProduct.vue
diff --git a/apps/web-app/app/components/form/DeleteProductVariant.vue b/apps/web-app/app/components/Form/DeleteProductVariant.vue
similarity index 100%
rename from apps/web-app/app/components/form/DeleteProductVariant.vue
rename to apps/web-app/app/components/Form/DeleteProductVariant.vue
diff --git a/apps/web-app/app/components/form/InitChannel.vue b/apps/web-app/app/components/Form/InitChannel.vue
similarity index 100%
rename from apps/web-app/app/components/form/InitChannel.vue
rename to apps/web-app/app/components/Form/InitChannel.vue
diff --git a/apps/web-app/app/components/form/InitMaster.vue b/apps/web-app/app/components/Form/InitMaster.vue
similarity index 100%
rename from apps/web-app/app/components/form/InitMaster.vue
rename to apps/web-app/app/components/Form/InitMaster.vue
diff --git a/apps/web-app/app/components/form/UpdateChannel.vue b/apps/web-app/app/components/Form/UpdateChannel.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateChannel.vue
rename to apps/web-app/app/components/Form/UpdateChannel.vue
diff --git a/apps/web-app/app/components/form/UpdateChannelPaymentMethod.vue b/apps/web-app/app/components/Form/UpdateChannelPaymentMethod.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateChannelPaymentMethod.vue
rename to apps/web-app/app/components/Form/UpdateChannelPaymentMethod.vue
diff --git a/apps/web-app/app/components/form/UpdateChannelReceivingMethod.vue b/apps/web-app/app/components/Form/UpdateChannelReceivingMethod.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateChannelReceivingMethod.vue
rename to apps/web-app/app/components/Form/UpdateChannelReceivingMethod.vue
diff --git a/apps/web-app/app/components/form/UpdateMenuActivity.vue b/apps/web-app/app/components/Form/UpdateMenuActivity.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateMenuActivity.vue
rename to apps/web-app/app/components/Form/UpdateMenuActivity.vue
diff --git a/apps/web-app/app/components/form/UpdateMenuCategory.vue b/apps/web-app/app/components/Form/UpdateMenuCategory.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateMenuCategory.vue
rename to apps/web-app/app/components/Form/UpdateMenuCategory.vue
diff --git a/apps/web-app/app/components/form/UpdateProduct.vue b/apps/web-app/app/components/Form/UpdateProduct.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateProduct.vue
rename to apps/web-app/app/components/Form/UpdateProduct.vue
diff --git a/apps/web-app/app/components/form/UpdateProductAvailability.vue b/apps/web-app/app/components/Form/UpdateProductAvailability.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateProductAvailability.vue
rename to apps/web-app/app/components/Form/UpdateProductAvailability.vue
diff --git a/apps/web-app/app/components/form/UpdateProductVariant.vue b/apps/web-app/app/components/Form/UpdateProductVariant.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateProductVariant.vue
rename to apps/web-app/app/components/Form/UpdateProductVariant.vue
diff --git a/apps/web-app/app/components/form/UpdateWarehouse.vue b/apps/web-app/app/components/Form/UpdateWarehouse.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateWarehouse.vue
rename to apps/web-app/app/components/Form/UpdateWarehouse.vue
diff --git a/apps/web-app/app/components/form/UpdateWorkingDayActivity.vue b/apps/web-app/app/components/Form/UpdateWorkingDayActivity.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateWorkingDayActivity.vue
rename to apps/web-app/app/components/Form/UpdateWorkingDayActivity.vue
diff --git a/apps/web-app/app/components/form/UpdateWorkingDays.vue b/apps/web-app/app/components/Form/UpdateWorkingDays.vue
similarity index 100%
rename from apps/web-app/app/components/form/UpdateWorkingDays.vue
rename to apps/web-app/app/components/Form/UpdateWorkingDays.vue
diff --git a/apps/web-app/app/components/form/UploadProductImage.vue b/apps/web-app/app/components/Form/UploadProductImage.vue
similarity index 100%
rename from apps/web-app/app/components/form/UploadProductImage.vue
rename to apps/web-app/app/components/Form/UploadProductImage.vue
diff --git a/apps/web-app/app/components/guide/Menu.vue b/apps/web-app/app/components/Guide/Menu.vue
similarity index 100%
rename from apps/web-app/app/components/guide/Menu.vue
rename to apps/web-app/app/components/Guide/Menu.vue
diff --git a/apps/web-app/app/components/guide/Menus.vue b/apps/web-app/app/components/Guide/Menus.vue
similarity index 100%
rename from apps/web-app/app/components/guide/Menus.vue
rename to apps/web-app/app/components/Guide/Menus.vue
diff --git a/apps/web-app/app/components/modal/DeliveryInfo.vue b/apps/web-app/app/components/Modal/DeliveryInfo.vue
similarity index 100%
rename from apps/web-app/app/components/modal/DeliveryInfo.vue
rename to apps/web-app/app/components/Modal/DeliveryInfo.vue
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 6a406bfb..fb176987 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -33,8 +33,6 @@ catalog:
   '@vueuse/nuxt': ^12.7.0
   aws4fetch: ^1.0.20
   bcrypt: ^5.1.1
-  class-variance-authority: ^0.7.0
-  clsx: ^2.1.1
   dotenv: ^16.4.7
   dotenv-cli: ^8.0.0
   drizzle-cuid2: ^2.0.0
@@ -50,10 +48,8 @@ catalog:
   nuxt-zod-i18n: ^1.11.5
   pg: ^8.13.3
   playwright: ^1.50.1
-  radix-vue: ^1.9.7
   semantic-release: ^24.2.3
   semantic-release-monorepo: ^8.0.2
-  shadcn-nuxt: ^0.10.4
   sharp: ^0.33.5
   typescript: ^5.7.3
   unbuild: ^3.3.1