From 4b42d0f8b898e2371578bdd1a01900a272e1a1e8 Mon Sep 17 00:00:00 2001
From: SpikeHD <spikegdofficial@gmail.com>
Date: Sat, 16 Jul 2022 16:42:20 -0700
Subject: [PATCH] reorg

---
 src/ui/components/menu/Options.tsx | 27 +++++++++++++++------------
 src/utils/server.ts                |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx
index 2ee3f92..41ee036 100644
--- a/src/ui/components/menu/Options.tsx
+++ b/src/ui/components/menu/Options.tsx
@@ -199,18 +199,6 @@ export default class Options extends React.Component<IProps, IState> {
             <DirInput onChange={this.setGameExec} value={this.state?.game_install_path} extensions={['exe']} />
           </div>
         </div>
-        {
-          this.state.swag && (
-            <div className='OptionSection' id="menuOptionsContainerAkebi">
-              <div className='OptionLabel' id="menuOptionsLabelAkebi">
-                <Tr text="swag.akebi" />
-              </div>
-              <div className='OptionValue' id="menuOptionsDirAkebi">
-                <DirInput onChange={this.setAkebi} value={this.state?.akebi_path} extensions={['exe']} />
-              </div>
-            </div>
-          )
-        }
         <div className='OptionSection' id="menuOptionsContainerGCJar">
           <div className='OptionLabel' id="menuOptionsLabelGCJar">
             <Tr text="options.grasscutter_jar" />
@@ -231,6 +219,21 @@ export default class Options extends React.Component<IProps, IState> {
             </BigButton>
           </div>
         </div>
+        {
+          this.state.swag && (
+            <>
+              <Divider />
+              <div className='OptionSection' id="menuOptionsContainerAkebi">
+                <div className='OptionLabel' id="menuOptionsLabelAkebi">
+                  <Tr text="swag.akebi" />
+                </div>
+                <div className='OptionValue' id="menuOptionsDirAkebi">
+                  <DirInput onChange={this.setAkebi} value={this.state?.akebi_path} extensions={['exe']} />
+                </div>
+              </div>
+            </>
+          )
+        }
 
         <Divider />
         
diff --git a/src/utils/server.ts b/src/utils/server.ts
index f2fc6d5..f60f3e6 100644
--- a/src/utils/server.ts
+++ b/src/utils/server.ts
@@ -1,4 +1,4 @@
-import { fs, invoke } from '@tauri-apps/api'
+import { invoke } from '@tauri-apps/api'
 
 export async function toggleEncryption(path: string) {
   let serverConf