diff --git a/src/components/molecules/ComponentBindingDialogWrapper.tsx b/src/components/molecules/ComponentBindingDialogWrapper.tsx
deleted file mode 100644
index 1912823..0000000
--- a/src/components/molecules/ComponentBindingDialogWrapper.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { ChangeEvent } from 'react'
-import { ComponentRenderer } from '@/lib/json-ui/component-renderer'
-import { cn } from '@/lib/utils'
-import componentBindingDialogDefinition from './definitions/component-binding-dialog.json'
-import type { ComponentBindingDialogWrapperProps } from './interfaces'
-
-export function ComponentBindingDialogWrapper({
-  open = false,
-  title = 'Component Bindings',
-  description = 'Connect component props to data sources.',
-  componentType,
-  componentId,
-  bindings = [],
-  onBindingChange,
-  onSave,
-  onCancel,
-  onOpenChange,
-  className,
-}: ComponentBindingDialogWrapperProps) {
-  const handleBindingFieldChange = (event: ChangeEvent<HTMLInputElement>) => {
-    const fieldId = event.currentTarget?.dataset?.fieldId || event.target?.dataset?.fieldId
-    if (!fieldId) return
-    onBindingChange?.(fieldId, event.target.value)
-  }
-
-  return (
-    <ComponentRenderer
-      component={componentBindingDialogDefinition}
-      data={{
-        open,
-        title,
-        description,
-        componentType,
-        componentId,
-        bindingFields: bindings,
-        emptyMessage: 'No bindings configured.',
-        contentClassName: cn('max-w-2xl', className),
-        onBindingFieldChange: handleBindingFieldChange,
-        onSave,
-        onCancel,
-        onOpenChange,
-        cancelLabel: 'Cancel',
-        saveLabel: 'Save',
-      }}
-    />
-  )
-}
diff --git a/src/components/molecules/DataSourceEditorDialogWrapper.tsx b/src/components/molecules/DataSourceEditorDialogWrapper.tsx
deleted file mode 100644
index 72530c7..0000000
--- a/src/components/molecules/DataSourceEditorDialogWrapper.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { ChangeEvent } from 'react'
-import { ComponentRenderer } from '@/lib/json-ui/component-renderer'
-import { cn } from '@/lib/utils'
-import dataSourceEditorDialogDefinition from './definitions/data-source-editor-dialog.json'
-import type { DataSourceEditorDialogWrapperProps } from './interfaces'
-
-export function DataSourceEditorDialogWrapper({
-  open = false,
-  title = 'Data Source',
-  description = 'Update data source details and fields.',
-  fields = [],
-  onFieldChange,
-  onSave,
-  onCancel,
-  onOpenChange,
-  className,
-}: DataSourceEditorDialogWrapperProps) {
-  const handleFieldChange = (event: ChangeEvent<HTMLInputElement>) => {
-    const fieldId = event.currentTarget?.dataset?.fieldId || event.target?.dataset?.fieldId
-    if (!fieldId) return
-    onFieldChange?.(fieldId, event.target.value)
-  }
-
-  return (
-    <ComponentRenderer
-      component={dataSourceEditorDialogDefinition}
-      data={{
-        open,
-        title,
-        description,
-        fields,
-        emptyMessage: 'No fields configured.',
-        contentClassName: cn('max-w-2xl', className),
-        onFieldChange: handleFieldChange,
-        onSave,
-        onCancel,
-        onOpenChange,
-        cancelLabel: 'Cancel',
-        saveLabel: 'Save',
-      }}
-    />
-  )
-}
diff --git a/src/components/molecules/index.ts b/src/components/molecules/index.ts
index fb5fa7a..1f8b59c 100644
--- a/src/components/molecules/index.ts
+++ b/src/components/molecules/index.ts
@@ -16,9 +16,15 @@ export { ToolbarButton } from './ToolbarButton'
 export { TreeFormDialog } from './TreeFormDialog'
 export { SearchInput } from './SearchInput'
 export { BindingEditor } from './BindingEditor'
-export { DataSourceEditorDialog } from './DataSourceEditorDialog'
-export { ComponentBindingDialog } from './ComponentBindingDialog'
 export { TreeCard } from './TreeCard'
 export { TreeListHeader } from './TreeListHeader'
-export { LoadingFallback, NavigationItem, PageHeaderContent } from '@/lib/json-ui/json-components'
+export { 
+  LoadingFallback, 
+  NavigationItem, 
+  PageHeaderContent,
+  ComponentBindingDialog,
+  DataSourceEditorDialog,
+  GitHubBuildStatus as GitHubBuildStatusJSON,
+  SaveIndicator as SaveIndicatorJSON
+} from '@/lib/json-ui/json-components'
 export { preloadMonacoEditor } from './LazyMonacoEditor'