diff --git a/package-lock.json b/package-lock.json
index 772dc55..2936256 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
             "name": "sakai-vue",
             "version": "0.0.0",
             "dependencies": {
-                "chart.js": "3.9.1",
+                "chart.js": "3.3.2",
                 "primeflex": "^3.2.1",
                 "primeicons": "^6.0.1",
                 "primevue": "^3.18.1",
@@ -450,9 +450,9 @@
             }
         },
         "node_modules/chart.js": {
-            "version": "3.9.1",
-            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
-            "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",
+            "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="
         },
         "node_modules/chokidar": {
             "version": "3.5.3",
@@ -2652,9 +2652,9 @@
             }
         },
         "chart.js": {
-            "version": "3.9.1",
-            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz",
-            "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",
+            "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="
         },
         "chokidar": {
             "version": "3.5.3",
diff --git a/src/layout/BlockViewer.vue b/src/components/BlockViewer.vue
similarity index 100%
rename from src/layout/BlockViewer.vue
rename to src/components/BlockViewer.vue
diff --git a/src/layout/CodeHighlight.js b/src/components/CodeHighlight.js
similarity index 100%
rename from src/layout/CodeHighlight.js
rename to src/components/CodeHighlight.js
diff --git a/src/main.js b/src/main.js
index 9971195..8c8fed8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,8 +100,8 @@ import TreeTable from 'primevue/treetable';
 import TriStateCheckbox from 'primevue/tristatecheckbox';
 import VirtualScroller from 'primevue/virtualscroller';
 
-import CodeHighlight from '@/layout/CodeHighlight';
-import BlockViewer from '@/layout/BlockViewer.vue';
+import CodeHighlight from '@/components/CodeHighlight';
+import BlockViewer from '@/components/BlockViewer.vue';
 
 import 'prismjs/themes/prism-coy.css';
 import '@/assets/styles.scss';