diff --git a/client-src/api/actions.js b/front-src/client/api/actions.js similarity index 100% rename from client-src/api/actions.js rename to front-src/client/api/actions.js diff --git a/client-src/api/app.js b/front-src/client/api/app.js similarity index 100% rename from client-src/api/app.js rename to front-src/client/api/app.js diff --git a/client-src/api/files.js b/front-src/client/api/files.js similarity index 100% rename from client-src/api/files.js rename to front-src/client/api/files.js diff --git a/client-src/api/obs.js b/front-src/client/api/obs.js similarity index 100% rename from client-src/api/obs.js rename to front-src/client/api/obs.js diff --git a/client-src/api/panels.js b/front-src/client/api/panels.js similarity index 100% rename from client-src/api/panels.js rename to front-src/client/api/panels.js diff --git a/client-src/api/twitch.js b/front-src/client/api/twitch.js similarity index 100% rename from client-src/api/twitch.js rename to front-src/client/api/twitch.js diff --git a/client-src/assets/images/Twitch_icon.svg b/front-src/client/assets/images/Twitch_icon.svg similarity index 100% rename from client-src/assets/images/Twitch_icon.svg rename to front-src/client/assets/images/Twitch_icon.svg diff --git a/client-src/assets/images/Twitch_logo.svg b/front-src/client/assets/images/Twitch_logo.svg similarity index 100% rename from client-src/assets/images/Twitch_logo.svg rename to front-src/client/assets/images/Twitch_logo.svg diff --git a/client-src/assets/images/Twitch_text.svg b/front-src/client/assets/images/Twitch_text.svg similarity index 100% rename from client-src/assets/images/Twitch_text.svg rename to front-src/client/assets/images/Twitch_text.svg diff --git a/client-src/assets/images/marv.svg b/front-src/client/assets/images/marv.svg similarity index 100% rename from client-src/assets/images/marv.svg rename to front-src/client/assets/images/marv.svg diff --git a/client-src/components/Anime/Timeline/Editor.svelte b/front-src/client/components/Anime/Timeline/Editor.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor.svelte rename to front-src/client/components/Anime/Timeline/Editor.svelte diff --git a/client-src/components/Anime/Timeline/Editor/AnimeIcon.svelte b/front-src/client/components/Anime/Timeline/Editor/AnimeIcon.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/AnimeIcon.svelte rename to front-src/client/components/Anime/Timeline/Editor/AnimeIcon.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Layout.svelte b/front-src/client/components/Anime/Timeline/Editor/Layout.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Layout.svelte rename to front-src/client/components/Anime/Timeline/Editor/Layout.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Input.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Input.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Input.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Input.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Keyframe.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Keyframe.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Keyframe.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Keyframe.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Panel.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Panel.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Panel.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Panel.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Panels/Attrs.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Attrs.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Panels/Attrs.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Attrs.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Panels/Info.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Info.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Panels/Info.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Info.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Panels/Style.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Style.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Panels/Style.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Style.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Panels/Trans.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Trans.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Panels/Trans.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Panels/Trans.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Settings/Section.svelte b/front-src/client/components/Anime/Timeline/Editor/Settings/Section.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Settings/Section.svelte rename to front-src/client/components/Anime/Timeline/Editor/Settings/Section.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Cursor.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Cursor.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Cursor.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Cursor.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Grid.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Grid.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Grid.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Grid.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Item.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Item.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Item.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Item.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Keyframe.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Keyframe.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Keyframe.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Keyframe.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Keyframes.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Keyframes.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Keyframes.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Keyframes.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Player.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Player.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Player.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Player.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Timeline/Ruler.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/Ruler.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Timeline/Ruler.svelte rename to front-src/client/components/Anime/Timeline/Editor/Timeline/Ruler.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer.svelte b/front-src/client/components/Anime/Timeline/Editor/Viewer.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer.svelte rename to front-src/client/components/Anime/Timeline/Editor/Viewer.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer/Items.svelte b/front-src/client/components/Anime/Timeline/Editor/Viewer/Items.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer/Items.svelte rename to front-src/client/components/Anime/Timeline/Editor/Viewer/Items.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer/Items/Audio.svelte b/front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Audio.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer/Items/Audio.svelte rename to front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Audio.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer/Items/Image.svelte b/front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Image.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer/Items/Image.svelte rename to front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Image.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer/Items/Text.svelte b/front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Text.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer/Items/Text.svelte rename to front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Text.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer/Items/Video.svelte b/front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Video.svelte similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer/Items/Video.svelte rename to front-src/client/components/Anime/Timeline/Editor/Viewer/Items/Video.svelte diff --git a/client-src/components/Anime/Timeline/Editor/Viewer/items.js b/front-src/client/components/Anime/Timeline/Editor/Viewer/items.js similarity index 100% rename from client-src/components/Anime/Timeline/Editor/Viewer/items.js rename to front-src/client/components/Anime/Timeline/Editor/Viewer/items.js diff --git a/client-src/components/Anime/Timeline/libs/createAnimeFromFile.js b/front-src/client/components/Anime/Timeline/libs/createAnimeFromFile.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/createAnimeFromFile.js rename to front-src/client/components/Anime/Timeline/libs/createAnimeFromFile.js diff --git a/client-src/components/Anime/Timeline/libs/createKeyframe.js b/front-src/client/components/Anime/Timeline/libs/createKeyframe.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/createKeyframe.js rename to front-src/client/components/Anime/Timeline/libs/createKeyframe.js diff --git a/client-src/components/Anime/Timeline/libs/getAttrs.js b/front-src/client/components/Anime/Timeline/libs/getAttrs.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/getAttrs.js rename to front-src/client/components/Anime/Timeline/libs/getAttrs.js diff --git a/client-src/components/Anime/Timeline/libs/getStyle.js b/front-src/client/components/Anime/Timeline/libs/getStyle.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/getStyle.js rename to front-src/client/components/Anime/Timeline/libs/getStyle.js diff --git a/client-src/components/Anime/Timeline/libs/getTrans.js b/front-src/client/components/Anime/Timeline/libs/getTrans.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/getTrans.js rename to front-src/client/components/Anime/Timeline/libs/getTrans.js diff --git a/client-src/components/Anime/Timeline/libs/settings.js b/front-src/client/components/Anime/Timeline/libs/settings.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/settings.js rename to front-src/client/components/Anime/Timeline/libs/settings.js diff --git a/client-src/components/Anime/Timeline/libs/store.js b/front-src/client/components/Anime/Timeline/libs/store.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/store.js rename to front-src/client/components/Anime/Timeline/libs/store.js diff --git a/client-src/components/Anime/Timeline/libs/utils.js b/front-src/client/components/Anime/Timeline/libs/utils.js similarity index 100% rename from client-src/components/Anime/Timeline/libs/utils.js rename to front-src/client/components/Anime/Timeline/libs/utils.js diff --git a/client-src/components/App.svelte b/front-src/client/components/App.svelte similarity index 100% rename from client-src/components/App.svelte rename to front-src/client/components/App.svelte diff --git a/client-src/components/App/Connected.svelte b/front-src/client/components/App/Connected.svelte similarity index 100% rename from client-src/components/App/Connected.svelte rename to front-src/client/components/App/Connected.svelte diff --git a/client-src/components/App/Connecting.svelte b/front-src/client/components/App/Connecting.svelte similarity index 100% rename from client-src/components/App/Connecting.svelte rename to front-src/client/components/App/Connecting.svelte diff --git a/client-src/components/App/Disconnected.svelte b/front-src/client/components/App/Disconnected.svelte similarity index 100% rename from client-src/components/App/Disconnected.svelte rename to front-src/client/components/App/Disconnected.svelte diff --git a/client-src/components/App/ElectronTopbar.svelte b/front-src/client/components/App/ElectronTopbar.svelte similarity index 100% rename from client-src/components/App/ElectronTopbar.svelte rename to front-src/client/components/App/ElectronTopbar.svelte diff --git a/client-src/components/App/LanguageSelect.svelte b/front-src/client/components/App/LanguageSelect.svelte similarity index 100% rename from client-src/components/App/LanguageSelect.svelte rename to front-src/client/components/App/LanguageSelect.svelte diff --git a/client-src/components/App/OpenOnStartup.svelte b/front-src/client/components/App/OpenOnStartup.svelte similarity index 100% rename from client-src/components/App/OpenOnStartup.svelte rename to front-src/client/components/App/OpenOnStartup.svelte diff --git a/client-src/components/App/SplashScreen.svelte b/front-src/client/components/App/SplashScreen.svelte similarity index 100% rename from client-src/components/App/SplashScreen.svelte rename to front-src/client/components/App/SplashScreen.svelte diff --git a/client-src/components/Dashboard/Drawer.svelte b/front-src/client/components/Dashboard/Drawer.svelte similarity index 100% rename from client-src/components/Dashboard/Drawer.svelte rename to front-src/client/components/Dashboard/Drawer.svelte diff --git a/client-src/components/Dashboard/Drawer/Toggle.svelte b/front-src/client/components/Dashboard/Drawer/Toggle.svelte similarity index 100% rename from client-src/components/Dashboard/Drawer/Toggle.svelte rename to front-src/client/components/Dashboard/Drawer/Toggle.svelte diff --git a/client-src/components/Dashboard/Main.svelte b/front-src/client/components/Dashboard/Main.svelte similarity index 100% rename from client-src/components/Dashboard/Main.svelte rename to front-src/client/components/Dashboard/Main.svelte diff --git a/client-src/components/Dashboard/Topbar.svelte b/front-src/client/components/Dashboard/Topbar.svelte similarity index 100% rename from client-src/components/Dashboard/Topbar.svelte rename to front-src/client/components/Dashboard/Topbar.svelte diff --git a/client-src/components/FileManager/FileIconState.svelte b/front-src/client/components/FileManager/FileIconState.svelte similarity index 100% rename from client-src/components/FileManager/FileIconState.svelte rename to front-src/client/components/FileManager/FileIconState.svelte diff --git a/client-src/components/FileManager/FileList.svelte b/front-src/client/components/FileManager/FileList.svelte similarity index 100% rename from client-src/components/FileManager/FileList.svelte rename to front-src/client/components/FileManager/FileList.svelte diff --git a/client-src/components/FileManager/FilterButtons.svelte b/front-src/client/components/FileManager/FilterButtons.svelte similarity index 100% rename from client-src/components/FileManager/FilterButtons.svelte rename to front-src/client/components/FileManager/FilterButtons.svelte diff --git a/client-src/components/FileManager/Layout.svelte b/front-src/client/components/FileManager/Layout.svelte similarity index 100% rename from client-src/components/FileManager/Layout.svelte rename to front-src/client/components/FileManager/Layout.svelte diff --git a/client-src/components/FileManager/Main.svelte b/front-src/client/components/FileManager/Main.svelte similarity index 100% rename from client-src/components/FileManager/Main.svelte rename to front-src/client/components/FileManager/Main.svelte diff --git a/client-src/components/OBS/Connect.svelte b/front-src/client/components/OBS/Connect.svelte similarity index 100% rename from client-src/components/OBS/Connect.svelte rename to front-src/client/components/OBS/Connect.svelte diff --git a/client-src/components/OBS/ConnectAtStartup.svelte b/front-src/client/components/OBS/ConnectAtStartup.svelte similarity index 100% rename from client-src/components/OBS/ConnectAtStartup.svelte rename to front-src/client/components/OBS/ConnectAtStartup.svelte diff --git a/client-src/components/OBS/Status.svelte b/front-src/client/components/OBS/Status.svelte similarity index 100% rename from client-src/components/OBS/Status.svelte rename to front-src/client/components/OBS/Status.svelte diff --git a/client-src/components/Panels/Main.svelte b/front-src/client/components/Panels/Main.svelte similarity index 100% rename from client-src/components/Panels/Main.svelte rename to front-src/client/components/Panels/Main.svelte diff --git a/client-src/components/Panels/Panel.svelte b/front-src/client/components/Panels/Panel.svelte similarity index 100% rename from client-src/components/Panels/Panel.svelte rename to front-src/client/components/Panels/Panel.svelte diff --git a/client-src/components/Panels/Panel/Grid.svelte b/front-src/client/components/Panels/Panel/Grid.svelte similarity index 100% rename from client-src/components/Panels/Panel/Grid.svelte rename to front-src/client/components/Panels/Panel/Grid.svelte diff --git a/client-src/components/Panels/Panel/Widget.svelte b/front-src/client/components/Panels/Panel/Widget.svelte similarity index 100% rename from client-src/components/Panels/Panel/Widget.svelte rename to front-src/client/components/Panels/Panel/Widget.svelte diff --git a/client-src/components/Panels/Panel/Widget/EditModal.svelte b/front-src/client/components/Panels/Panel/Widget/EditModal.svelte similarity index 100% rename from client-src/components/Panels/Panel/Widget/EditModal.svelte rename to front-src/client/components/Panels/Panel/Widget/EditModal.svelte diff --git a/client-src/components/Panels/Panel/Widget/EditModal/Action.svelte b/front-src/client/components/Panels/Panel/Widget/EditModal/Action.svelte similarity index 100% rename from client-src/components/Panels/Panel/Widget/EditModal/Action.svelte rename to front-src/client/components/Panels/Panel/Widget/EditModal/Action.svelte diff --git a/client-src/components/Panels/Panel/Widget/EditModal/Styles.svelte b/front-src/client/components/Panels/Panel/Widget/EditModal/Styles.svelte similarity index 100% rename from client-src/components/Panels/Panel/Widget/EditModal/Styles.svelte rename to front-src/client/components/Panels/Panel/Widget/EditModal/Styles.svelte diff --git a/client-src/components/Panels/Panel/Widget/EditMode.svelte b/front-src/client/components/Panels/Panel/Widget/EditMode.svelte similarity index 100% rename from client-src/components/Panels/Panel/Widget/EditMode.svelte rename to front-src/client/components/Panels/Panel/Widget/EditMode.svelte diff --git a/client-src/components/Panels/Panel/Widget/RemoveCross.svelte b/front-src/client/components/Panels/Panel/Widget/RemoveCross.svelte similarity index 100% rename from client-src/components/Panels/Panel/Widget/RemoveCross.svelte rename to front-src/client/components/Panels/Panel/Widget/RemoveCross.svelte diff --git a/client-src/components/Panels/Topbar.svelte b/front-src/client/components/Panels/Topbar.svelte similarity index 100% rename from client-src/components/Panels/Topbar.svelte rename to front-src/client/components/Panels/Topbar.svelte diff --git a/client-src/components/Panels/Topbar/Selector.svelte b/front-src/client/components/Panels/Topbar/Selector.svelte similarity index 100% rename from client-src/components/Panels/Topbar/Selector.svelte rename to front-src/client/components/Panels/Topbar/Selector.svelte diff --git a/client-src/components/Panels/Topbar/Settings.svelte b/front-src/client/components/Panels/Topbar/Settings.svelte similarity index 100% rename from client-src/components/Panels/Topbar/Settings.svelte rename to front-src/client/components/Panels/Topbar/Settings.svelte diff --git a/client-src/components/Panels/Topbar/Settings/AddButton.svelte b/front-src/client/components/Panels/Topbar/Settings/AddButton.svelte similarity index 100% rename from client-src/components/Panels/Topbar/Settings/AddButton.svelte rename to front-src/client/components/Panels/Topbar/Settings/AddButton.svelte diff --git a/client-src/components/Panels/Topbar/Settings/RemoveButton.svelte b/front-src/client/components/Panels/Topbar/Settings/RemoveButton.svelte similarity index 100% rename from client-src/components/Panels/Topbar/Settings/RemoveButton.svelte rename to front-src/client/components/Panels/Topbar/Settings/RemoveButton.svelte diff --git a/client-src/components/Panels/Topbar/Settings/RenameInput.svelte b/front-src/client/components/Panels/Topbar/Settings/RenameInput.svelte similarity index 100% rename from client-src/components/Panels/Topbar/Settings/RenameInput.svelte rename to front-src/client/components/Panels/Topbar/Settings/RenameInput.svelte diff --git a/client-src/components/Twitch/ConnectAtStartup.svelte b/front-src/client/components/Twitch/ConnectAtStartup.svelte similarity index 100% rename from client-src/components/Twitch/ConnectAtStartup.svelte rename to front-src/client/components/Twitch/ConnectAtStartup.svelte diff --git a/client-src/components/Twitch/Login.svelte b/front-src/client/components/Twitch/Login.svelte similarity index 100% rename from client-src/components/Twitch/Login.svelte rename to front-src/client/components/Twitch/Login.svelte diff --git a/client-src/components/Twitch/StreamStatus.svelte b/front-src/client/components/Twitch/StreamStatus.svelte similarity index 100% rename from client-src/components/Twitch/StreamStatus.svelte rename to front-src/client/components/Twitch/StreamStatus.svelte diff --git a/client-src/components/UI/Button.svelte b/front-src/client/components/UI/Button.svelte similarity index 100% rename from client-src/components/UI/Button.svelte rename to front-src/client/components/UI/Button.svelte diff --git a/client-src/components/UI/CenteredBox.svelte b/front-src/client/components/UI/CenteredBox.svelte similarity index 100% rename from client-src/components/UI/CenteredBox.svelte rename to front-src/client/components/UI/CenteredBox.svelte diff --git a/client-src/components/UI/Checkbox.svelte b/front-src/client/components/UI/Checkbox.svelte similarity index 100% rename from client-src/components/UI/Checkbox.svelte rename to front-src/client/components/UI/Checkbox.svelte diff --git a/client-src/components/UI/ColorPicker.svelte b/front-src/client/components/UI/ColorPicker.svelte similarity index 100% rename from client-src/components/UI/ColorPicker.svelte rename to front-src/client/components/UI/ColorPicker.svelte diff --git a/client-src/components/UI/ConfirmModal.svelte b/front-src/client/components/UI/ConfirmModal.svelte similarity index 100% rename from client-src/components/UI/ConfirmModal.svelte rename to front-src/client/components/UI/ConfirmModal.svelte diff --git a/client-src/components/UI/FileIcon.svelte b/front-src/client/components/UI/FileIcon.svelte similarity index 100% rename from client-src/components/UI/FileIcon.svelte rename to front-src/client/components/UI/FileIcon.svelte diff --git a/client-src/components/UI/FileInput.svelte b/front-src/client/components/UI/FileInput.svelte similarity index 100% rename from client-src/components/UI/FileInput.svelte rename to front-src/client/components/UI/FileInput.svelte diff --git a/client-src/components/UI/Flexbar.svelte b/front-src/client/components/UI/Flexbar.svelte similarity index 100% rename from client-src/components/UI/Flexbar.svelte rename to front-src/client/components/UI/Flexbar.svelte diff --git a/client-src/components/UI/Flexbar/Spacer.svelte b/front-src/client/components/UI/Flexbar/Spacer.svelte similarity index 100% rename from client-src/components/UI/Flexbar/Spacer.svelte rename to front-src/client/components/UI/Flexbar/Spacer.svelte diff --git a/client-src/components/UI/Fontpicker.svelte b/front-src/client/components/UI/Fontpicker.svelte similarity index 100% rename from client-src/components/UI/Fontpicker.svelte rename to front-src/client/components/UI/Fontpicker.svelte diff --git a/client-src/components/UI/FullScreenModal.svelte b/front-src/client/components/UI/FullScreenModal.svelte similarity index 100% rename from client-src/components/UI/FullScreenModal.svelte rename to front-src/client/components/UI/FullScreenModal.svelte diff --git a/client-src/components/UI/HorizontalScroller.svelte b/front-src/client/components/UI/HorizontalScroller.svelte similarity index 100% rename from client-src/components/UI/HorizontalScroller.svelte rename to front-src/client/components/UI/HorizontalScroller.svelte diff --git a/client-src/components/UI/Icon.svelte b/front-src/client/components/UI/Icon.svelte similarity index 100% rename from client-src/components/UI/Icon.svelte rename to front-src/client/components/UI/Icon.svelte diff --git a/client-src/components/UI/Input.svelte b/front-src/client/components/UI/Input.svelte similarity index 100% rename from client-src/components/UI/Input.svelte rename to front-src/client/components/UI/Input.svelte diff --git a/client-src/components/UI/Modal.svelte b/front-src/client/components/UI/Modal.svelte similarity index 100% rename from client-src/components/UI/Modal.svelte rename to front-src/client/components/UI/Modal.svelte diff --git a/client-src/components/UI/Progressbar.svelte b/front-src/client/components/UI/Progressbar.svelte similarity index 100% rename from client-src/components/UI/Progressbar.svelte rename to front-src/client/components/UI/Progressbar.svelte diff --git a/client-src/components/UI/Select.svelte b/front-src/client/components/UI/Select.svelte similarity index 100% rename from client-src/components/UI/Select.svelte rename to front-src/client/components/UI/Select.svelte diff --git a/client-src/components/UI/Splitter.svelte b/front-src/client/components/UI/Splitter.svelte similarity index 100% rename from client-src/components/UI/Splitter.svelte rename to front-src/client/components/UI/Splitter.svelte diff --git a/client-src/components/UI/loadFonts.js b/front-src/client/components/UI/loadFonts.js similarity index 100% rename from client-src/components/UI/loadFonts.js rename to front-src/client/components/UI/loadFonts.js diff --git a/client-src/components/Widgets/Anime/Timeline/Settings.svelte b/front-src/client/components/Widgets/Anime/Timeline/Settings.svelte similarity index 100% rename from client-src/components/Widgets/Anime/Timeline/Settings.svelte rename to front-src/client/components/Widgets/Anime/Timeline/Settings.svelte diff --git a/client-src/components/Widgets/Anime/Timeline/Widget.svelte b/front-src/client/components/Widgets/Anime/Timeline/Widget.svelte similarity index 100% rename from client-src/components/Widgets/Anime/Timeline/Widget.svelte rename to front-src/client/components/Widgets/Anime/Timeline/Widget.svelte diff --git a/client-src/components/Widgets/Anime/Timeline/config.js b/front-src/client/components/Widgets/Anime/Timeline/config.js similarity index 100% rename from client-src/components/Widgets/Anime/Timeline/config.js rename to front-src/client/components/Widgets/Anime/Timeline/config.js diff --git a/client-src/components/Widgets/Anime/Timeline/index.js b/front-src/client/components/Widgets/Anime/Timeline/index.js similarity index 100% rename from client-src/components/Widgets/Anime/Timeline/index.js rename to front-src/client/components/Widgets/Anime/Timeline/index.js diff --git a/client-src/components/Widgets/OBS/GoToScene/Settings.svelte b/front-src/client/components/Widgets/OBS/GoToScene/Settings.svelte similarity index 100% rename from client-src/components/Widgets/OBS/GoToScene/Settings.svelte rename to front-src/client/components/Widgets/OBS/GoToScene/Settings.svelte diff --git a/client-src/components/Widgets/OBS/GoToScene/Widget.svelte b/front-src/client/components/Widgets/OBS/GoToScene/Widget.svelte similarity index 100% rename from client-src/components/Widgets/OBS/GoToScene/Widget.svelte rename to front-src/client/components/Widgets/OBS/GoToScene/Widget.svelte diff --git a/client-src/components/Widgets/OBS/GoToScene/config.js b/front-src/client/components/Widgets/OBS/GoToScene/config.js similarity index 100% rename from client-src/components/Widgets/OBS/GoToScene/config.js rename to front-src/client/components/Widgets/OBS/GoToScene/config.js diff --git a/client-src/components/Widgets/OBS/GoToScene/index.js b/front-src/client/components/Widgets/OBS/GoToScene/index.js similarity index 100% rename from client-src/components/Widgets/OBS/GoToScene/index.js rename to front-src/client/components/Widgets/OBS/GoToScene/index.js diff --git a/client-src/components/Widgets/OBS/SceneList/Widget.svelte b/front-src/client/components/Widgets/OBS/SceneList/Widget.svelte similarity index 100% rename from client-src/components/Widgets/OBS/SceneList/Widget.svelte rename to front-src/client/components/Widgets/OBS/SceneList/Widget.svelte diff --git a/client-src/components/Widgets/OBS/SceneList/config.js b/front-src/client/components/Widgets/OBS/SceneList/config.js similarity index 100% rename from client-src/components/Widgets/OBS/SceneList/config.js rename to front-src/client/components/Widgets/OBS/SceneList/config.js diff --git a/client-src/components/Widgets/OBS/SceneList/index.js b/front-src/client/components/Widgets/OBS/SceneList/index.js similarity index 100% rename from client-src/components/Widgets/OBS/SceneList/index.js rename to front-src/client/components/Widgets/OBS/SceneList/index.js diff --git a/client-src/components/Widgets/OBS/ToggleScene/Settings.svelte b/front-src/client/components/Widgets/OBS/ToggleScene/Settings.svelte similarity index 100% rename from client-src/components/Widgets/OBS/ToggleScene/Settings.svelte rename to front-src/client/components/Widgets/OBS/ToggleScene/Settings.svelte diff --git a/client-src/components/Widgets/OBS/ToggleScene/Widget.svelte b/front-src/client/components/Widgets/OBS/ToggleScene/Widget.svelte similarity index 100% rename from client-src/components/Widgets/OBS/ToggleScene/Widget.svelte rename to front-src/client/components/Widgets/OBS/ToggleScene/Widget.svelte diff --git a/client-src/components/Widgets/OBS/ToggleScene/config.js b/front-src/client/components/Widgets/OBS/ToggleScene/config.js similarity index 100% rename from client-src/components/Widgets/OBS/ToggleScene/config.js rename to front-src/client/components/Widgets/OBS/ToggleScene/config.js diff --git a/client-src/components/Widgets/OBS/ToggleScene/index.js b/front-src/client/components/Widgets/OBS/ToggleScene/index.js similarity index 100% rename from client-src/components/Widgets/OBS/ToggleScene/index.js rename to front-src/client/components/Widgets/OBS/ToggleScene/index.js diff --git a/client-src/components/Widgets/OBS/WidgetWrapper.svelte b/front-src/client/components/Widgets/OBS/WidgetWrapper.svelte similarity index 100% rename from client-src/components/Widgets/OBS/WidgetWrapper.svelte rename to front-src/client/components/Widgets/OBS/WidgetWrapper.svelte diff --git a/client-src/components/Widgets/Twitch/Chat/Settings.svelte b/front-src/client/components/Widgets/Twitch/Chat/Settings.svelte similarity index 100% rename from client-src/components/Widgets/Twitch/Chat/Settings.svelte rename to front-src/client/components/Widgets/Twitch/Chat/Settings.svelte diff --git a/client-src/components/Widgets/Twitch/Chat/Widget.svelte b/front-src/client/components/Widgets/Twitch/Chat/Widget.svelte similarity index 100% rename from client-src/components/Widgets/Twitch/Chat/Widget.svelte rename to front-src/client/components/Widgets/Twitch/Chat/Widget.svelte diff --git a/client-src/components/Widgets/Twitch/Chat/config.js b/front-src/client/components/Widgets/Twitch/Chat/config.js similarity index 100% rename from client-src/components/Widgets/Twitch/Chat/config.js rename to front-src/client/components/Widgets/Twitch/Chat/config.js diff --git a/client-src/components/Widgets/Twitch/Chat/index.js b/front-src/client/components/Widgets/Twitch/Chat/index.js similarity index 100% rename from client-src/components/Widgets/Twitch/Chat/index.js rename to front-src/client/components/Widgets/Twitch/Chat/index.js diff --git a/client-src/components/Widgets/Twitch/Stream/Settings.svelte b/front-src/client/components/Widgets/Twitch/Stream/Settings.svelte similarity index 100% rename from client-src/components/Widgets/Twitch/Stream/Settings.svelte rename to front-src/client/components/Widgets/Twitch/Stream/Settings.svelte diff --git a/client-src/components/Widgets/Twitch/Stream/Widget.svelte b/front-src/client/components/Widgets/Twitch/Stream/Widget.svelte similarity index 100% rename from client-src/components/Widgets/Twitch/Stream/Widget.svelte rename to front-src/client/components/Widgets/Twitch/Stream/Widget.svelte diff --git a/client-src/components/Widgets/Twitch/Stream/config.js b/front-src/client/components/Widgets/Twitch/Stream/config.js similarity index 100% rename from client-src/components/Widgets/Twitch/Stream/config.js rename to front-src/client/components/Widgets/Twitch/Stream/config.js diff --git a/client-src/components/Widgets/Twitch/Stream/index.js b/front-src/client/components/Widgets/Twitch/Stream/index.js similarity index 100% rename from client-src/components/Widgets/Twitch/Stream/index.js rename to front-src/client/components/Widgets/Twitch/Stream/index.js diff --git a/client-src/components/Widgets/WidgetLabel.svelte b/front-src/client/components/Widgets/WidgetLabel.svelte similarity index 100% rename from client-src/components/Widgets/WidgetLabel.svelte rename to front-src/client/components/Widgets/WidgetLabel.svelte diff --git a/client-src/components/Widgets/WidgetWrapper.svelte b/front-src/client/components/Widgets/WidgetWrapper.svelte similarity index 100% rename from client-src/components/Widgets/WidgetWrapper.svelte rename to front-src/client/components/Widgets/WidgetWrapper.svelte diff --git a/client-src/components/Widgets/index.js b/front-src/client/components/Widgets/index.js similarity index 100% rename from client-src/components/Widgets/index.js rename to front-src/client/components/Widgets/index.js diff --git a/client-src/index.js b/front-src/client/index.js similarity index 100% rename from client-src/index.js rename to front-src/client/index.js diff --git a/client-src/libs/actions.js b/front-src/client/libs/actions.js similarity index 100% rename from client-src/libs/actions.js rename to front-src/client/libs/actions.js diff --git a/client-src/libs/i18next.js b/front-src/client/libs/i18next.js similarity index 100% rename from client-src/libs/i18next.js rename to front-src/client/libs/i18next.js diff --git a/client-src/libs/panels.js b/front-src/client/libs/panels.js similarity index 100% rename from client-src/libs/panels.js rename to front-src/client/libs/panels.js diff --git a/client-src/libs/socket.io.js b/front-src/client/libs/socket.io.js similarity index 100% rename from client-src/libs/socket.io.js rename to front-src/client/libs/socket.io.js diff --git a/client-src/libs/svelte/click-outside.js b/front-src/client/libs/svelte/click-outside.js similarity index 100% rename from client-src/libs/svelte/click-outside.js rename to front-src/client/libs/svelte/click-outside.js diff --git a/client-src/libs/svelte/double-tap.js b/front-src/client/libs/svelte/double-tap.js similarity index 100% rename from client-src/libs/svelte/double-tap.js rename to front-src/client/libs/svelte/double-tap.js diff --git a/client-src/libs/svelte/pannable.js b/front-src/client/libs/svelte/pannable.js similarity index 100% rename from client-src/libs/svelte/pannable.js rename to front-src/client/libs/svelte/pannable.js diff --git a/client-src/libs/twitch.js b/front-src/client/libs/twitch.js similarity index 100% rename from client-src/libs/twitch.js rename to front-src/client/libs/twitch.js diff --git a/client-src/stores/actions.js b/front-src/client/stores/actions.js similarity index 100% rename from client-src/stores/actions.js rename to front-src/client/stores/actions.js diff --git a/client-src/stores/app.js b/front-src/client/stores/app.js similarity index 90% rename from client-src/stores/app.js rename to front-src/client/stores/app.js index dd12532a..7a511870 100644 --- a/client-src/stores/app.js +++ b/front-src/client/stores/app.js @@ -1,4 +1,4 @@ -import { name, version } from "../../package"; +import { name, version } from "../../../package"; import { writable } from "svelte/store"; import { emit } from "@/libs/socket.io"; import capitalize from "capitalize"; diff --git a/client-src/stores/drawer.js b/front-src/client/stores/drawer.js similarity index 100% rename from client-src/stores/drawer.js rename to front-src/client/stores/drawer.js diff --git a/client-src/stores/files.js b/front-src/client/stores/files.js similarity index 100% rename from client-src/stores/files.js rename to front-src/client/stores/files.js diff --git a/client-src/stores/i18next.js b/front-src/client/stores/i18next.js similarity index 100% rename from client-src/stores/i18next.js rename to front-src/client/stores/i18next.js diff --git a/client-src/stores/obs.js b/front-src/client/stores/obs.js similarity index 100% rename from client-src/stores/obs.js rename to front-src/client/stores/obs.js diff --git a/client-src/stores/panels.js b/front-src/client/stores/panels.js similarity index 100% rename from client-src/stores/panels.js rename to front-src/client/stores/panels.js diff --git a/client-src/stores/twitch.js b/front-src/client/stores/twitch.js similarity index 100% rename from client-src/stores/twitch.js rename to front-src/client/stores/twitch.js diff --git a/overlay-src/overlay.js b/front-src/overlay/overlay.js similarity index 100% rename from overlay-src/overlay.js rename to front-src/overlay/overlay.js diff --git a/package.json b/package.json index f19cc442..7e00b13c 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "start": "electron app/main/index.js", "watch": "concurrently -k -n tailwind,client,app -c red,magenta,yellow \"yarn tailwind:build\" \"yarn client:watch\" \"yarn app:watch\"", "build": "yarn client:build && yarn tailwind:build --prod", - "prettify": "prettier --write ./app ./client-src", - "lint": "eslint ./app ./client-src --fix && yarn prettify" + "prettify": "prettier --write ./app ./front-src", + "lint": "eslint ./app ./front-src --fix && yarn prettify" }, "build": { "productName": "Marv", diff --git a/rollup.config.js b/rollup.config.js index 535c0d64..79263aae 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -11,11 +11,13 @@ import json from "@rollup/plugin-json"; const watch = process.env.ROLLUP_WATCH; -const clientDir = "client-src"; -const overlayDir = "overlay-src"; +const frontDir = "front-src"; const publicDir = "app/client"; + const jsDir = `${publicDir}/js`; const cssDir = `${publicDir}/css`; +const clientDir = `${frontDir}/client`; +const overlayDir = `${frontDir}/overlay`; export default { input: [`${clientDir}/index.js`, `${overlayDir}/overlay.js`],