diff --git a/src/App.vue b/src/App.vue
index d55601b..e084842 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,10 +12,10 @@
 <script>
 import mainForm from "./components/mainForm";
 import toggleButton from "./components/toggleButton";
-import helper from "./helper";
+import helper from "./utils/helper";
 import { translate as t, translatePlural as n } from "@nextcloud/l10n";
-import Http from "./http";
-import nctable from "./ncTable";
+import Http from "./lib/http";
+import nctable from "./lib/ncTable";
 
 const successCallback = (data, element) => {
   if (!data) {
diff --git a/src/buttonActions.js b/src/actions/buttonActions.js
similarity index 91%
rename from src/buttonActions.js
rename to src/actions/buttonActions.js
index fdb446b..28425d3 100644
--- a/src/buttonActions.js
+++ b/src/actions/buttonActions.js
@@ -1,6 +1,6 @@
-import Http from './http'
-import helper from './helper'
-import eventHandler from './eventHandler'
+import Http from '../lib/http'
+import helper from '../utils/helper'
+import eventHandler from '../lib/eventHandler'
 const buttonHandler = (event, type) => {
     let element = event.target;
     event.stopPropagation();
diff --git a/src/updatePage.js b/src/actions/updatePage.js
similarity index 94%
rename from src/updatePage.js
rename to src/actions/updatePage.js
index bfe2c67..4aea671 100644
--- a/src/updatePage.js
+++ b/src/actions/updatePage.js
@@ -1,6 +1,7 @@
-import helper from './helper'
-import eventHandler from './eventHandler';
-import Http from './http'
+import helper from '../utils/helper'
+import eventHandler from '../lib/eventHandler';
+import Http from '../lib/http'
+
 const basePath = "/apps/ncdownloader/status/";
 const tableContainer = ".table";
 export default {
diff --git a/src/index.js b/src/index.js
index b0ba974..211ddf6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,9 +1,9 @@
-import helper from './helper'
-import eventHandler from './eventHandler'
-import Http from './http'
+import helper from './utils/helper'
+import eventHandler from './lib/eventHandler'
+import Http from './lib/http'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
-import updatePage from './updatePage'
-import buttonActions from './buttonActions'
+import updatePage from './actions/updatePage'
+import buttonActions from './actions/buttonActions'
 import './css/style.scss'
 import './css/table.scss'
 import { createApp } from 'vue'
diff --git a/src/autoComplete.js b/src/lib/autoComplete.js
similarity index 100%
rename from src/autoComplete.js
rename to src/lib/autoComplete.js
diff --git a/src/eventHandler.js b/src/lib/eventHandler.js
similarity index 100%
rename from src/eventHandler.js
rename to src/lib/eventHandler.js
diff --git a/src/http.js b/src/lib/http.js
similarity index 100%
rename from src/http.js
rename to src/lib/http.js
diff --git a/src/OC/msg.js b/src/lib/msg.js
similarity index 99%
rename from src/OC/msg.js
rename to src/lib/msg.js
index 7b0b8d6..9a78bce 100644
--- a/src/OC/msg.js
+++ b/src/lib/msg.js
@@ -3,7 +3,7 @@
  * It can be used to display a starting message (e.g. "Saving...") and then
  * replace it with a green success message or a red error message.
  *
- * @namespace OC.msg
+ * 
  */
 export default {
 	/**
diff --git a/src/ncTable.js b/src/lib/ncTable.js
similarity index 99%
rename from src/ncTable.js
rename to src/lib/ncTable.js
index af465de..9a73d89 100644
--- a/src/ncTable.js
+++ b/src/lib/ncTable.js
@@ -1,4 +1,4 @@
-import helper from './helper'
+import helper from '../utils/helper'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 
 class ncTable {
diff --git a/src/settingsForm.js b/src/lib/settingsForm.js
similarity index 100%
rename from src/settingsForm.js
rename to src/lib/settingsForm.js
diff --git a/src/settings.js b/src/settings.js
index e1f1dca..e1b8b08 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,13 +1,13 @@
-import Http from './http'
-import OC_msg from './OC/msg'
+import Http from './lib/http'
+import OC_msg from './lib/msg'
 import {
     generateUrl
 } from '@nextcloud/router'
-import settingsForm from './settingsForm'
-import autoComplete from './autoComplete';
-import eventHandler from './eventHandler';
-import aria2Options from './aria2Options';
-import helper from './helper';
+import settingsForm from './lib/settingsForm'
+import autoComplete from './lib/autoComplete';
+import eventHandler from './lib/eventHandler';
+import aria2Options from './utils/aria2Options';
+import helper from './utils/helper';
 import './css/autoComplete.css'
 import './css/style.scss'
 
diff --git a/src/aria2Options.js b/src/utils/aria2Options.js
similarity index 100%
rename from src/aria2Options.js
rename to src/utils/aria2Options.js
diff --git a/src/helper.js b/src/utils/helper.js
similarity index 98%
rename from src/helper.js
rename to src/utils/helper.js
index f4c4d99..b9810aa 100644
--- a/src/helper.js
+++ b/src/utils/helper.js
@@ -4,8 +4,8 @@ import {
 import Toastify from 'toastify-js'
 import "toastify-js/src/toastify.css"
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
-import nctable from './ncTable';
-import Http from './http'
+import nctable from '../lib/ncTable';
+import Http from '../lib/http'
 
 const helper = {
     vue: {},