diff --git a/src/html/login-modal.html b/src/components/login-modal/login-modal.html
similarity index 100%
rename from src/html/login-modal.html
rename to src/components/login-modal/login-modal.html
diff --git a/src/html/login-modal.js b/src/components/login-modal/login-modal.js
similarity index 100%
rename from src/html/login-modal.js
rename to src/components/login-modal/login-modal.js
diff --git a/src/services/modal.service.ts b/src/services/modal.service.ts
index 8fea690..52b6545 100644
--- a/src/services/modal.service.ts
+++ b/src/services/modal.service.ts
@@ -1,5 +1,5 @@
-import modalHtml from '../html/login-modal.html?raw';
-import modalScript from '../html/login-modal.js?raw';
+import modalHtml from '../components/login-modal/login-modal.html?raw';
+import modalScript from '../components/login-modal/login-modal.js?raw';
 import Services from './service';
 import { U32_MAX } from './service';
 import { navigate } from '../router';
diff --git a/src/services/service.ts b/src/services/service.ts
index edb9d56..5cd485f 100644
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -128,12 +128,10 @@ export default class Services {
   }
 
   async sendNewTxMessage(message: string) {
-    // console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ newTxMessage:", message)
     await sendMessage('NewTx', message);
   }
 
   async sendCommitMessage(message: string) {
-    // console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ CommitMessage:", message)
     await sendMessage('Commit', message);
   }
 
@@ -145,18 +143,9 @@ export default class Services {
   }
 
   async sendFaucetMessage(message: string): Promise<void> {
-    // console.log("🚀 ~ WebSocketClient ~ this.ws.onopen= ~ faucetMessage:", message)
     await sendMessage('Faucet', message);
   }
   async parseCipher(message: string) {
-    // try {
-    //   JSON.parse(message)
-    //   const router = await Routing.getInstance();
-    //   router.closeLoginModal()
-    //   this.injectProcessListPage()
-    // } catch {
-    //   console.log('Not proper format for cipher')
-    // }
     try {
       console.log('parsing new cipher');
       const apiReturn = await this.sdkClient.parse_cipher(message, 0.00001);
@@ -170,7 +159,6 @@ export default class Services {
 
   async parseNewTx(tx: string) {
     try {
-      // console.log('==============> sending txxxxxxx parser', tx)
       const parsedTx = await this.sdkClient.parse_new_tx(tx, 0, 0.0001);
       if (parsedTx) {
         console.log('🚀 ~ Services ~ parseNewTx ~ parsedTx:', parsedTx);
@@ -293,21 +281,6 @@ export default class Services {
     }
   }
 
-  // async saveTxToDb(tx: CachedMessage) {
-  //   const database = await Database.getInstance();
-  //   const indexedDb = await database.getDb();
-  //   await database.writeObject(indexedDb, 'messages', tx, null);
-  // }
-
-  // async saveCipherTxToDb(tx: string) {
-  //   const database = await Database.getInstance();
-  //   const indexedDb = await database.getDb();
-
-  //   if(tx) {
-  //     await database.writeObject(indexedDb, database.getStoreList().AnkCipherMessages, tx, null);
-  //   }
-  // }
-
   async getAmount(): Promise<BigInt> {
     const amount = await this.sdkClient.get_available_amount();
     return amount;
@@ -319,12 +292,10 @@ export default class Services {
 
   async dumpDevice() {
     const device = await this.sdkClient.dump_device();
-    // console.log("🚀 ~ Services ~ dumpDevice ~ device:", device)
     return device;
   }
 
   async saveDevice(device: any): Promise<any> {
-    // console.log("🚀 ~ Services ~ saveDevice ~ device:", device)
     const db = await Database.getInstance();
     db.addObject({
       storeName: 'wallet',