diff --git a/src/components/accordion/AccordionTab.vue b/src/components/accordiontab/AccordionTab.vue
similarity index 100%
rename from src/components/accordion/AccordionTab.vue
rename to src/components/accordiontab/AccordionTab.vue
diff --git a/src/components/tabview/TabPanel.vue b/src/components/tabpanel/TabPanel.vue
similarity index 100%
rename from src/components/tabview/TabPanel.vue
rename to src/components/tabpanel/TabPanel.vue
diff --git a/src/main.js b/src/main.js
index 6f3d1144a..95af6ada8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,7 @@ import App from './App.vue';
 import router from './router';
 import AutoComplete from './components/autocomplete/AutoComplete';
 import Accordion from './components/accordion/Accordion';
-import AccordionTab from './components/accordion/AccordionTab';
+import AccordionTab from './components/accordiontab/AccordionTab';
 import Button from './components/button/Button';
 import Calendar from './components/calendar/Calendar';
 import Card from './components/card/Card';
@@ -40,7 +40,7 @@ import Toast from './components/toast/Toast';
 import ToastService from './components/toast/ToastService';
 import Toolbar from './components/toolbar/Toolbar';
 import TabView from './components/tabview/TabView';
-import TabPanel from './components/tabview/TabPanel';
+import TabPanel from './components/tabpanel/TabPanel';
 import ToggleButton from './components/togglebutton/ToggleButton';
 import TriStateCheckbox from './components/tristatecheckbox/TriStateCheckbox';
 import ValidationMessage from './components/validationmessage/ValidationMessage';
diff --git a/src/views/accordion/AccordionDoc.vue b/src/views/accordion/AccordionDoc.vue
index a7e8f065d..8e50fdfb7 100644
--- a/src/views/accordion/AccordionDoc.vue
+++ b/src/views/accordion/AccordionDoc.vue
@@ -4,7 +4,8 @@
 			<TabPanel header="Documentation">
 				<h3>Import</h3>
 <CodeHighlight lang="javascript">
-import {Accordion, AccordionTab} from 'primevue/accordion';
+import Accordion from 'primevue/accordion';
+import AccordionTab from 'primevue/accordiontab';
 </CodeHighlight>
 
 				<h3>Getting Started</h3>
diff --git a/src/views/tabview/TabViewDoc.vue b/src/views/tabview/TabViewDoc.vue
index 22515c277..cf93ce393 100644
--- a/src/views/tabview/TabViewDoc.vue
+++ b/src/views/tabview/TabViewDoc.vue
@@ -4,7 +4,8 @@
 			<TabPanel header="Documentation">
 				<h3>Import</h3>
 <CodeHighlight lang="javascript">
-import {TabView, TabPanel} from 'primevue/tabview';
+import TabView from 'primevue/tabview';
+import TabPanel from 'primevue/tabpanel';
 </CodeHighlight>
 
 				<h3>Getting Started</h3>