diff --git a/samples/react-tabacordion/.devcontainer/devcontainer.json b/samples/react-accordion-with-richtext/.devcontainer/devcontainer.json
similarity index 100%
rename from samples/react-tabacordion/.devcontainer/devcontainer.json
rename to samples/react-accordion-with-richtext/.devcontainer/devcontainer.json
diff --git a/samples/react-tabacordion/.devcontainer/spfx-startup.sh b/samples/react-accordion-with-richtext/.devcontainer/spfx-startup.sh
similarity index 100%
rename from samples/react-tabacordion/.devcontainer/spfx-startup.sh
rename to samples/react-accordion-with-richtext/.devcontainer/spfx-startup.sh
diff --git a/samples/react-tabacordion/.gitignore b/samples/react-accordion-with-richtext/.gitignore
similarity index 100%
rename from samples/react-tabacordion/.gitignore
rename to samples/react-accordion-with-richtext/.gitignore
diff --git a/samples/react-tabacordion/.npmignore b/samples/react-accordion-with-richtext/.npmignore
similarity index 100%
rename from samples/react-tabacordion/.npmignore
rename to samples/react-accordion-with-richtext/.npmignore
diff --git a/samples/react-tabacordion/.yo-rc.json b/samples/react-accordion-with-richtext/.yo-rc.json
similarity index 100%
rename from samples/react-tabacordion/.yo-rc.json
rename to samples/react-accordion-with-richtext/.yo-rc.json
diff --git a/samples/react-tabacordion/assets/TabAccordionWebpart.gif b/samples/react-accordion-with-richtext/assets/TabAccordionWebpart.gif
similarity index 100%
rename from samples/react-tabacordion/assets/TabAccordionWebpart.gif
rename to samples/react-accordion-with-richtext/assets/TabAccordionWebpart.gif
diff --git a/samples/react-tabacordion/config/config.json b/samples/react-accordion-with-richtext/config/config.json
similarity index 100%
rename from samples/react-tabacordion/config/config.json
rename to samples/react-accordion-with-richtext/config/config.json
diff --git a/samples/react-tabacordion/config/deploy-azure-storage.json b/samples/react-accordion-with-richtext/config/deploy-azure-storage.json
similarity index 100%
rename from samples/react-tabacordion/config/deploy-azure-storage.json
rename to samples/react-accordion-with-richtext/config/deploy-azure-storage.json
diff --git a/samples/react-tabacordion/config/package-solution.json b/samples/react-accordion-with-richtext/config/package-solution.json
similarity index 100%
rename from samples/react-tabacordion/config/package-solution.json
rename to samples/react-accordion-with-richtext/config/package-solution.json
diff --git a/samples/react-tabacordion/config/serve.json b/samples/react-accordion-with-richtext/config/serve.json
similarity index 100%
rename from samples/react-tabacordion/config/serve.json
rename to samples/react-accordion-with-richtext/config/serve.json
diff --git a/samples/react-tabacordion/config/write-manifests.json b/samples/react-accordion-with-richtext/config/write-manifests.json
similarity index 100%
rename from samples/react-tabacordion/config/write-manifests.json
rename to samples/react-accordion-with-richtext/config/write-manifests.json
diff --git a/samples/react-tabacordion/gulpfile.js b/samples/react-accordion-with-richtext/gulpfile.js
similarity index 100%
rename from samples/react-tabacordion/gulpfile.js
rename to samples/react-accordion-with-richtext/gulpfile.js
diff --git a/samples/react-tabacordion/package-lock.json b/samples/react-accordion-with-richtext/package-lock.json
similarity index 100%
rename from samples/react-tabacordion/package-lock.json
rename to samples/react-accordion-with-richtext/package-lock.json
diff --git a/samples/react-tabacordion/package.json b/samples/react-accordion-with-richtext/package.json
similarity index 100%
rename from samples/react-tabacordion/package.json
rename to samples/react-accordion-with-richtext/package.json
diff --git a/samples/react-tabacordion/src/index.ts b/samples/react-accordion-with-richtext/src/index.ts
similarity index 100%
rename from samples/react-tabacordion/src/index.ts
rename to samples/react-accordion-with-richtext/src/index.ts
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/TabAccordionWebPart.manifest.json b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/TabAccordionWebPart.manifest.json
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/TabAccordionWebPart.manifest.json
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/TabAccordionWebPart.manifest.json
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/TabAccordionWebPart.ts b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/TabAccordionWebPart.ts
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/TabAccordionWebPart.ts
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/TabAccordionWebPart.ts
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/CAccordion.module.scss b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CAccordion.module.scss
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/CAccordion.module.scss
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CAccordion.module.scss
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/CAccordion.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CAccordion.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/CAccordion.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CAccordion.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/CTab.module.scss b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CTab.module.scss
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/CTab.module.scss
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CTab.module.scss
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/CTab.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CTab.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/CTab.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/CTab.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/ICAccordionProps.ts b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/ICAccordionProps.ts
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/ICAccordionProps.ts
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/ICAccordionProps.ts
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/ICTabProps.ts b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/ICTabProps.ts
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/ICTabProps.ts
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/ICTabProps.ts
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/tinymcereact.d.ts b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/tinymcereact.d.ts
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/tinymcereact.d.ts
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/tinymcereact.d.ts
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/Accordion.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/Accordion.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/Accordion.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/Accordion.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItem.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItem.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItem.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItem.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemBody.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemBody.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemBody.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemBody.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemTitle.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemTitle.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemTitle.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/AccordionItemTitle.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/index.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/index.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Accordion/index.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Accordion/index.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/TabContent.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/TabContent.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/TabContent.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/TabContent.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/TabLink.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/TabLink.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/TabLink.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/TabLink.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/Tabs.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/Tabs.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/Tabs.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/Tabs.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/index.tsx b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/index.tsx
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/components/utilities/Tab/index.tsx
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/components/utilities/Tab/index.tsx
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/loc/en-us.js b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/loc/en-us.js
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/loc/en-us.js
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/loc/en-us.js
diff --git a/samples/react-tabacordion/src/webparts/tabAccordion/loc/mystrings.d.ts b/samples/react-accordion-with-richtext/src/webparts/tabAccordion/loc/mystrings.d.ts
similarity index 100%
rename from samples/react-tabacordion/src/webparts/tabAccordion/loc/mystrings.d.ts
rename to samples/react-accordion-with-richtext/src/webparts/tabAccordion/loc/mystrings.d.ts
diff --git a/samples/react-tabacordion/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_color.png b/samples/react-accordion-with-richtext/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_color.png
similarity index 100%
rename from samples/react-tabacordion/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_color.png
rename to samples/react-accordion-with-richtext/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_color.png
diff --git a/samples/react-tabacordion/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_outline.png b/samples/react-accordion-with-richtext/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_outline.png
similarity index 100%
rename from samples/react-tabacordion/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_outline.png
rename to samples/react-accordion-with-richtext/teams/34cb4eea-9e5a-4d5b-94e7-a7df94bb417b_outline.png
diff --git a/samples/react-tabacordion/tsconfig.json b/samples/react-accordion-with-richtext/tsconfig.json
similarity index 100%
rename from samples/react-tabacordion/tsconfig.json
rename to samples/react-accordion-with-richtext/tsconfig.json
diff --git a/samples/react-tabacordion/tslint.json b/samples/react-accordion-with-richtext/tslint.json
similarity index 100%
rename from samples/react-tabacordion/tslint.json
rename to samples/react-accordion-with-richtext/tslint.json
diff --git a/samples/react-tabacordion/README.md b/samples/react-tabacordion/README.md
deleted file mode 100644
index e7d23903b..000000000
--- a/samples/react-tabacordion/README.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-page_type: sample
-products:
-- office-sp
-languages:
-- javascript
-- typescript
-extensions:
- contentType: samples
- technologies:
- - SharePoint Framework
- platforms:
- - react
- createdDate: 03/30/2022 12:00:00 AM
----
-# Tab Accordion Web Part with Property Field Collection Data and tinyMCE for Rich Text Editing
-
-## Summary
-
-- This Web Part allows users to create content as Tabbed content using Property Field Collection Data and tinyMCE for Rich Text Editing targeted for SharePoint Online.
-- Provides options to view as an Accordion or Tab.
-- In mobile browser defaults to Accordion view.
-
-![Web part preview](assets/TabAccordionWebpart.gif)
-
-## Compatibility
-
-![SPFx 1.13.1](https://img.shields.io/badge/SPFx-1.13.1-green.svg)
-![Node.js v14 | v12](https://img.shields.io/badge/Node.js-v14%20%7C%20v12-green.svg)
-![Compatible with SharePoint Online](https://img.shields.io/badge/SharePoint%20Online-Compatible-green.svg)
-![Does not work with SharePoint 2019](https://img.shields.io/badge/SharePoint%20Server%202019-Incompatible-red.svg "SharePoint Server 2019 requires SPFx 1.4.1 or lower")
-![Does not work with SharePoint 2016 (Feature Pack 2)](https://img.shields.io/badge/SharePoint%20Server%202016%20(Feature%20Pack%202)-Incompatible-red.svg "SharePoint Server 2016 Feature Pack 2 requires SPFx 1.1")
-![Local Workbench Unsupported](https://img.shields.io/badge/Local%20Workbench-Unsupported-red.svg "Local workbench is no longer available as of SPFx 1.13 and above")
-![Hosted Workbench Compatible](https://img.shields.io/badge/Hosted%20Workbench-Compatible-green.svg)
-![Compatible with Remote Containers](https://img.shields.io/badge/Remote%20Containers-Compatible-green.svg)
-
-## Applies to
-
-- [SharePoint Framework](https://aka.ms/spfx)
-- [Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant)
-
-> Get your own free development tenant by subscribing to [Microsoft 365 developer program](http://aka.ms/o365devprogram)
-
-## Prerequisites
-
-There are no pre-requisites to use these samples.
-
-## Solution
-
-Solution|Author(s)
---------|---------
-react-TabAccordion | [Arun Kumar Perumal](https://github.com/arunkumarperumal) - LinkedIn:
-
-## Version history
-
-Version|Date|Comments
--------|----|--------
-1.0|March 30, 2022|Initial release
-
-
-## Minimal path to awesome
-
-- Clone this repository (or [download this solution as a .ZIP file](https://pnp.github.io/download-partial/?url=https://github.com/pnp/sp-dev-fx-webparts/tree/main/samples/react-tabaccordion) then unzip it)
-- Ensure that you are at the solution folder
-- in the command-line run:
- - `npm install`
- - `gulp serve`
-
-> This sample can also be opened with [VS Code Remote Development](https://code.visualstudio.com/docs/remote/remote-overview). Visit for further instructions.
-
-## Features
-
-This Web Part allows users to create content as Tabbed content using Property Field Collection Data and tinyMCE for Rich Text Editing targeted for SharePoint Online.
-
-Has the following features:
-
-- Ability to create Tabs or Accordions based content
-- Ability to create Tabs with Rich Text Editor for content using tinyMCE Control
-- Defaults to Accordion in Mobile displays
-- Uses Custom Accordion components included in the code.
-- Uses Custom Tab components included in the code
-- Use the site Primary colors and themes for display
-
-
-> Share your web part with others through Microsoft 365 Patterns and Practices program to get visibility and exposure. More details on the community, open-source projects and other activities from http://aka.ms/m365pnp.
-
-## References
-
-- [Getting started with SharePoint Framework](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant)
-- [Building for Microsoft teams](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/build-for-teams-overview)
-- [Use Microsoft Graph in your solution](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/web-parts/get-started/using-microsoft-graph-apis)
-- [Publish SharePoint Framework applications to the Marketplace](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/publish-to-marketplace-overview)
-- [Microsoft 365 Patterns and Practices](https://aka.ms/m365pnp) - Guidance, tooling, samples and open-source controls for your Microsoft 365 development
-
-
-## Help
-
-
-We do not support samples, but this community is always willing to help, and we want to improve these samples. We use GitHub to track issues, which makes it easy for community members to volunteer their time and help resolve issues.
-
-If you're having issues building the solution, please run [spfx doctor](https://pnp.github.io/cli-microsoft365/cmd/spfx/spfx-doctor/) from within the solution folder to diagnose incompatibility issues with your environment.
-
-You can try looking at [issues related to this sample](https://github.com/pnp/sp-dev-fx-webparts/issues?q=label%3A%22sample%3A%20react-tabaccordion%22) to see if anybody else is having the same issues.
-
-You can also try looking at [discussions related to this sample](https://github.com/pnp/sp-dev-fx-webparts/discussions?discussions_q=react-tabaccordion) and see what the community is saying.
-
-If you encounter any issues while using this sample, [create a new issue](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected%2Csample%3A%20react-tabaccordion&template=bug-report.yml&sample=react-tabaccordion&authors=@arunkumarperumal&title=react-tabaccordion%20-%20).
-
-For questions regarding this sample, [create a new question](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Aquestion%2Csample%3A%20react-tabaccordion&template=question.yml&sample=react-tabaccordion&authors=@arunkumarperumal&title=react-tabaccordion%20-%20).
-
-Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Aenhancement%2Csample%3A%20react-tabaccordion&template=suggestion.yml&sample=react-tabaccordion&authors=@arunkumarperumal&title=react-tabaccordion%20-%20).
-
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
-