diff --git a/apps/showcase/doc/imagecompare/pt/PTViewer.vue b/apps/showcase/doc/imagecompare/pt/PTViewer.vue
index f4f60a89c..f5d190652 100644
--- a/apps/showcase/doc/imagecompare/pt/PTViewer.vue
+++ b/apps/showcase/doc/imagecompare/pt/PTViewer.vue
@@ -2,10 +2,10 @@
     <DocPTViewer :docs="docs">
         <ImageCompare style="width: 728px; height: 410px">
             <template #left>
-                <img src="~/assets/images/island1.jpg" />
+                <img src="https://primefaces.org/cdn/primevue/images/compare/island1.jpg" />
             </template>
             <template #right>
-                <img src="~/assets/images/island2.jpg" />
+                <img src="https://primefaces.org/cdn/primevue/images/compare/island2.jpg" />
             </template>
         </ImageCompare>
     </DocPTViewer>
diff --git a/apps/showcase/package.json b/apps/showcase/package.json
index 56efd0575..db7d54352 100644
--- a/apps/showcase/package.json
+++ b/apps/showcase/package.json
@@ -69,4 +69,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
+}
\ No newline at end of file
diff --git a/packages/core/package.json b/packages/core/package.json
index 956ec7730..633ed000b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -63,4 +63,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
+}
\ No newline at end of file
diff --git a/packages/core/src/index.d.ts b/packages/core/src/index.d.ts
index 4d5e477a5..d1f2dcaea 100644
--- a/packages/core/src/index.d.ts
+++ b/packages/core/src/index.d.ts
@@ -47,6 +47,8 @@ export * from '@primevue/core/base/style';
 export * from '@primevue/core/basecomponent';
 export * from '@primevue/core/basecomponent/style';
 export * from '@primevue/core/basedirective';
+export * from '@primevue/core/baseeditableholder';
+export * from '@primevue/core/baseinput';
 export * from '@primevue/core/config';
 export { default as PrimeVue } from '@primevue/core/config';
 export * from '@primevue/core/service';
diff --git a/packages/core/src/index.js b/packages/core/src/index.js
index dd1769e93..e07fda996 100644
--- a/packages/core/src/index.js
+++ b/packages/core/src/index.js
@@ -12,6 +12,12 @@ export { default as BaseComponentStyle } from '@primevue/core/basecomponent/styl
 // BaseDirective
 export { default as BaseDirective } from '@primevue/core/basedirective';
 
+// BaseEditableHolder
+export { default as BaseEditableHolder } from '@primevue/core/baseeditableholder';
+
+// BaseInput
+export { default as BaseInput } from '@primevue/core/baseinput';
+
 // PrimeVue
 export * from '@primevue/core/config';
 export { default as PrimeVue } from '@primevue/core/config';
diff --git a/packages/form/package.json b/packages/form/package.json
index c4ffceab8..27e883671 100644
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -29,6 +29,10 @@
                 "types": "./form/index.d.ts",
                 "import": "./form/index.mjs"
             },
+            "./style": {
+                "types": "./form/style/index.d.ts",
+                "import": "./form/style/index.mjs"
+            },
             "./*": {
                 "types": "./*/index.d.ts",
                 "import": "./*/index.mjs"
@@ -53,4 +57,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
\ No newline at end of file
+}
diff --git a/packages/primevue/package.json b/packages/primevue/package.json
index 8d5c19f61..2ca4b64a1 100644
--- a/packages/primevue/package.json
+++ b/packages/primevue/package.json
@@ -81,6 +81,8 @@
         "./chart/style": "./src/chart/style/ChartStyle.js",
         "./checkbox": "./src/checkbox/Checkbox.vue",
         "./checkbox/style": "./src/checkbox/style/CheckboxStyle.js",
+        "./checkboxgroup": "./src/checkboxgroup/CheckboxGroup.vue",
+        "./checkboxgroup/style": "./src/checkboxgroup/style/CheckboxGroupStyle.js",
         "./chip": "./src/chip/Chip.vue",
         "./chip/style": "./src/chip/style/ChipStyle.js",
         "./chips": "./src/chips/Chips.vue",
@@ -213,6 +215,8 @@
         "./progressspinner/style": "./src/progressspinner/style/ProgressSpinnerStyle.js",
         "./radiobutton": "./src/radiobutton/RadioButton.vue",
         "./radiobutton/style": "./src/radiobutton/style/RadioButtonStyle.js",
+        "./radiobuttongroup": "./src/radiobuttongroup/RadioButtonGroup.vue",
+        "./radiobuttongroup/style": "./src/radiobuttongroup/style/RadioButtonGroupStyle.js",
         "./rating": "./src/rating/Rating.vue",
         "./rating/style": "./src/rating/style/RatingStyle.js",
         "./ripple": "./src/ripple/Ripple.js",
diff --git a/packages/primevue/rollup.config.mjs b/packages/primevue/rollup.config.mjs
index 625c07935..477d0eeb0 100644
--- a/packages/primevue/rollup.config.mjs
+++ b/packages/primevue/rollup.config.mjs
@@ -50,6 +50,8 @@ const ALIAS_ENTRIES = [
     { find: '@primevue/core/basecomponent/style', replacement: path.resolve(__dirname, '../core/src/basecomponent/style/BaseComponentStyle.js') },
     { find: '@primevue/core/basecomponent', replacement: path.resolve(__dirname, '../core/src/basecomponent/BaseComponent.vue') },
     { find: '@primevue/core/basedirective', replacement: path.resolve(__dirname, '../core/src/basedirective/BaseDirective.js') },
+    { find: '@primevue/core/baseeditableholder', replacement: path.resolve(__dirname, '../core/src/baseeditableholder/BaseEditableHolder.vue') },
+    { find: '@primevue/core/baseinput', replacement: path.resolve(__dirname, '../core/src/baseinput/BaseInput.vue') },
     { find: '@primevue/core/config', replacement: path.resolve(__dirname, '../core/src/config/PrimeVue.js') },
     { find: '@primevue/core/service', replacement: path.resolve(__dirname, '../core/src/service/PrimeVueService.js') },
     { find: '@primevue/core/usestyle', replacement: path.resolve(__dirname, '../core/src/usestyle/UseStyle.js') },
diff --git a/packages/primevue/src/primevue.js b/packages/primevue/src/primevue.js
index d3cbf584e..d78a9be96 100644
--- a/packages/primevue/src/primevue.js
+++ b/packages/primevue/src/primevue.js
@@ -146,6 +146,12 @@ export { default as Checkbox } from './checkbox/Checkbox.vue';
 export * from './checkbox/style/CheckboxStyle.js';
 export { default as CheckboxStyle } from './checkbox/style/CheckboxStyle.js';
 
+// CheckboxGroup
+export * from './checkboxgroup/CheckboxGroup.vue';
+export { default as CheckboxGroup } from './checkboxgroup/CheckboxGroup.vue';
+export * from './checkboxgroup/style/CheckboxGroupStyle.js';
+export { default as CheckboxGroupStyle } from './checkboxgroup/style/CheckboxGroupStyle.js';
+
 // Chip
 export * from './chip/Chip.vue';
 export { default as Chip } from './chip/Chip.vue';
@@ -548,6 +554,12 @@ export { default as RadioButton } from './radiobutton/RadioButton.vue';
 export * from './radiobutton/style/RadioButtonStyle.js';
 export { default as RadioButtonStyle } from './radiobutton/style/RadioButtonStyle.js';
 
+// RadioButtonGroup
+export * from './radiobuttongroup/RadioButtonGroup.vue';
+export { default as RadioButtonGroup } from './radiobuttongroup/RadioButtonGroup.vue';
+export * from './radiobuttongroup/style/RadioButtonGroupStyle.js';
+export { default as RadioButtonGroupStyle } from './radiobuttongroup/style/RadioButtonGroupStyle.js';
+
 // Rating
 export * from './rating/Rating.vue';
 export { default as Rating } from './rating/Rating.vue';