1 files changed, 20 insertions, 22 deletions

diff --git a/src/pages/blog/page/[number].tsx b/src/pages/blog/page/[number].tsx
index bfd9953..4eaade5 100644
--- a/src/pages/blog/page/[number].tsx
+++ b/src/pages/blog/page/[number].tsx
@@ -4,45 +4,43 @@ import { useRouter } from 'next/router';
 import Script from 'next/script';
 import { ParsedUrlQuery } from 'querystring';
 import { useIntl } from 'react-intl';
-import PostsList from '../../../components/organisms/layout/posts-list';
-import LinksListWidget from '../../../components/organisms/widgets/links-list-widget';
-import { getLayout } from '../../../components/templates/layout/layout';
-import PageLayout from '../../../components/templates/page/page-layout';
+import {
+  getLayout,
+  LinksListWidget,
+  PageLayout,
+  PostsList,
+} from '../../../components';
 import {
   getArticles,
   getArticlesEndCursor,
-  getTotalArticles,
-} from '../../../services/graphql/articles';
-import {
   getThematicsPreview,
-  getTotalThematics,
-} from '../../../services/graphql/thematics';
-import {
   getTopicsPreview,
+  getTotalArticles,
+  getTotalThematics,
   getTotalTopics,
-} from '../../../services/graphql/topics';
-import { type NextPageWithLayout } from '../../../types/app';
-import { EdgesResponse } from '../../../types/graphql/queries';
+} from '../../../services/graphql';
 import {
+  type EdgesResponse,
+  type NextPageWithLayout,
   type RawArticle,
   type RawThematicPreview,
   type RawTopicPreview,
-} from '../../../types/raw-data';
+} from '../../../types';
 import { settings } from '../../../utils/config';
-import { loadTranslation, type Messages } from '../../../utils/helpers/i18n';
 import {
+  getBlogSchema,
   getLinksListItems,
   getPageLinkFromRawData,
   getPostsList,
-} from '../../../utils/helpers/pages';
-import {
-  getBlogSchema,
   getSchemaJson,
   getWebPageSchema,
-} from '../../../utils/helpers/schema-org';
-import useBreadcrumb from '../../../utils/hooks/use-breadcrumb';
-import useRedirection from '../../../utils/hooks/use-redirection';
-import useSettings from '../../../utils/hooks/use-settings';
+} from '../../../utils/helpers';
+import { loadTranslation, type Messages } from '../../../utils/helpers/server';
+import {
+  useBreadcrumb,
+  useRedirection,
+  useSettings,
+} from '../../../utils/hooks';
 
 type BlogPageProps = {
   articles: EdgesResponse<RawArticle>;