diff --git a/client/src/components/rightSideBar/SideBarWidget.component.jsx b/client/src/components/rightSideBar/SideBarWidget/SideBarWidget.component.jsx
similarity index 100%
rename from client/src/components/rightSideBar/SideBarWidget.component.jsx
rename to client/src/components/rightSideBar/SideBarWidget/SideBarWidget.component.jsx
diff --git a/client/src/components/rightSideBar/SideBarWidget.styles.scss b/client/src/components/rightSideBar/SideBarWidget/SideBarWidget.styles.scss
similarity index 100%
rename from client/src/components/rightSideBar/SideBarWidget.styles.scss
rename to client/src/components/rightSideBar/SideBarWidget/SideBarWidget.styles.scss
diff --git a/client/src/components/rightSideBar/TagsWidget.component.jsx b/client/src/components/rightSideBar/TagsWidget/TagsWidget.component.jsx
similarity index 92%
rename from client/src/components/rightSideBar/TagsWidget.component.jsx
rename to client/src/components/rightSideBar/TagsWidget/TagsWidget.component.jsx
index ddf490e..8b93b9d 100644
--- a/client/src/components/rightSideBar/TagsWidget.component.jsx
+++ b/client/src/components/rightSideBar/TagsWidget/TagsWidget.component.jsx
@@ -3,8 +3,8 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 
-import { getTags } from '../../redux/tags/tags.actions';
-import TagBadge from "../TagBadge/TagBadge.component";
+import { getTags } from '../../../redux/tags/tags.actions';
+import TagBadge from "../../TagBadge/TagBadge.component";
 
 import './TagsWidget.styles.scss';
 
diff --git a/client/src/components/rightSideBar/TagsWidget.styles.scss b/client/src/components/rightSideBar/TagsWidget/TagsWidget.styles.scss
similarity index 100%
rename from client/src/components/rightSideBar/TagsWidget.styles.scss
rename to client/src/components/rightSideBar/TagsWidget/TagsWidget.styles.scss
diff --git a/client/src/components/rightSideBar/rightSideBar.component.jsx b/client/src/components/rightSideBar/rightSideBar.component.jsx
index 05acde3..8d6231f 100644
--- a/client/src/components/rightSideBar/rightSideBar.component.jsx
+++ b/client/src/components/rightSideBar/rightSideBar.component.jsx
@@ -1,7 +1,7 @@
 import React, {Fragment} from 'react';
 
-import SideBarWidget from './SideBarWidget.component';
-import TagsWidget from './TagsWidget.component';
+import SideBarWidget from './SideBarWidget/SideBarWidget.component';
+import TagsWidget from './TagsWidget/TagsWidget.component';
 
 import './rightSideBar.styles.scss';
 
diff --git a/client/src/pages/Register/Caption.component.jsx b/client/src/pages/Register/Caption/Caption.component.jsx
similarity index 100%
rename from client/src/pages/Register/Caption.component.jsx
rename to client/src/pages/Register/Caption/Caption.component.jsx
diff --git a/client/src/pages/Register/Caption.styles.scss b/client/src/pages/Register/Caption/Caption.styles.scss
similarity index 100%
rename from client/src/pages/Register/Caption.styles.scss
rename to client/src/pages/Register/Caption/Caption.styles.scss
diff --git a/client/src/pages/Register/Register.component.jsx b/client/src/pages/Register/Register.component.jsx
index ceb063f..3203d47 100644
--- a/client/src/pages/Register/Register.component.jsx
+++ b/client/src/pages/Register/Register.component.jsx
@@ -4,7 +4,7 @@ import { Redirect } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { setAlert } from '../../redux/alert/alert.actions';
 
-import Caption from './Caption.component';
+import Caption from './Caption/Caption.component';
 import AuthForm from '../../components/AuthForm/AuthForm.component';
 
 import './Register.styles.scss'
diff --git a/client/src/pages/TagsPage/TagPanel.component.jsx b/client/src/pages/TagsPage/TagPanel/TagPanel.component.jsx
similarity index 93%
rename from client/src/pages/TagsPage/TagPanel.component.jsx
rename to client/src/pages/TagsPage/TagPanel/TagPanel.component.jsx
index cb914a8..0328f56 100644
--- a/client/src/pages/TagsPage/TagPanel.component.jsx
+++ b/client/src/pages/TagsPage/TagPanel/TagPanel.component.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import moment from 'moment';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import TagBadge from "../../components/TagBadge/TagBadge.component";
+import TagBadge from "../../../components/TagBadge/TagBadge.component";
 
 import './TagPanel.styles.scss';
 
diff --git a/client/src/pages/TagsPage/TagPanel.styles.scss b/client/src/pages/TagsPage/TagPanel/TagPanel.styles.scss
similarity index 100%
rename from client/src/pages/TagsPage/TagPanel.styles.scss
rename to client/src/pages/TagsPage/TagPanel/TagPanel.styles.scss
diff --git a/client/src/pages/TagsPage/TagsPage.component.jsx b/client/src/pages/TagsPage/TagsPage.component.jsx
index 028c819..ec9483e 100644
--- a/client/src/pages/TagsPage/TagsPage.component.jsx
+++ b/client/src/pages/TagsPage/TagsPage.component.jsx
@@ -5,7 +5,7 @@ import { getTags } from '../../redux/tags/tags.actions';
 
 import './TagsPage.styles.scss'
 import SideBar from '../../components/sideBar/sideBar.component';
-import TagPanel from './TagPanel.component';
+import TagPanel from './TagPanel/TagPanel.component';
 import RightSideBar from '../../components/rightSideBar/rightSideBar.component';
 import Spinner from "../../components/spinner/spinner.component";
 
diff --git a/client/src/pages/UsersPage/UserPanel.component.jsx b/client/src/pages/UsersPage/UserPanel/UserPanel.component.jsx
similarity index 100%
rename from client/src/pages/UsersPage/UserPanel.component.jsx
rename to client/src/pages/UsersPage/UserPanel/UserPanel.component.jsx
diff --git a/client/src/pages/UsersPage/UserPanel.styles.scss b/client/src/pages/UsersPage/UserPanel/UserPanel.styles.scss
similarity index 100%
rename from client/src/pages/UsersPage/UserPanel.styles.scss
rename to client/src/pages/UsersPage/UserPanel/UserPanel.styles.scss
diff --git a/client/src/pages/UsersPage/UsersPage.component.jsx b/client/src/pages/UsersPage/UsersPage.component.jsx
index f25d64c..45e4f72 100644
--- a/client/src/pages/UsersPage/UsersPage.component.jsx
+++ b/client/src/pages/UsersPage/UsersPage.component.jsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { getUsers } from '../../redux/users/users.actions';
 
 import SideBar from '../../components/sideBar/sideBar.component';
-import UserPanel from './UserPanel.component';
+import UserPanel from './UserPanel/UserPanel.component';
 import RightSideBar from '../../components/rightSideBar/rightSideBar.component';
 import Spinner from "../../components/spinner/spinner.component";
 import SearchBox from "../../components/SearchBox/SearchBox.component";