diff --git a/ayo.js b/ayo.js
index 0653d19..ecfeb12 100644
--- a/ayo.js
+++ b/ayo.js
@@ -1,4 +1,4 @@
-import { LeaderBoardService } from './src/services/leader-board.service.js';
+import { LeaderBoardService } from './src/modules/leader-board/leader-board';
 
 const leaderBoard = new LeaderBoardService('mw-leaders', 'mw-all');
 
diff --git a/src/index.js b/src/index.js
index 40d4a0a..2025a83 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,15 +1,7 @@
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
 import './index.css';
-import './services/loading/loading.css';
+import './modules/loading/loading.css';
 import './assets/favicon.ico';
 import { Minesweeper } from './minesweeper.js';
 
-/** start the game **/
 const myMinesweeper = new Minesweeper();
 myMinesweeper.initialize();
\ No newline at end of file
diff --git a/src/minesweeper.js b/src/minesweeper.js
index ab56c3f..b077c8a 100644
--- a/src/minesweeper.js
+++ b/src/minesweeper.js
@@ -1,20 +1,12 @@
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
-
 import {
     LeaderBoardService,
     LoggerService,
     StorageService,
     TimerService
-} from './services';
+} from './modules';
 import { levels } from './levels.js';
 
-const VERSION = "0.3.7";
+const VERSION = "0.3.8";
 const MOBILE_BUSY_DELAY = 250;
 const PC_BUSY_DELAY = 500;
 const TEST_MODE = false;
diff --git a/src/services/db.service.js b/src/modules/database/db.js
similarity index 90%
rename from src/services/db.service.js
rename to src/modules/database/db.js
index eb919a2..783c88a 100644
--- a/src/services/db.service.js
+++ b/src/modules/database/db.js
@@ -3,7 +3,6 @@ import 'firebase/firestore';
 
 export class DatabaseService {
     constructor() {
-// Your web app's Firebase configuration
         const config = {
             apiKey: "AIzaSyAbDzNHCSFh59e3r5sZA4_2ZHJnJ6SCCxM",
             authDomain: "moment-188701.firebaseapp.com",
@@ -13,7 +12,6 @@ export class DatabaseService {
             messagingSenderId: "113827947104",
             appId: "1:113827947104:web:b176f746d8358302c51905"
         };
-        // Initialize Firebase
         firebase.initializeApp(config);
         this.store = firebase.firestore();
     }
diff --git a/src/services/dialog.service.js b/src/modules/dialog/dialog.js
similarity index 79%
rename from src/services/dialog.service.js
rename to src/modules/dialog/dialog.js
index 0462d47..e43b35d 100644
--- a/src/services/dialog.service.js
+++ b/src/modules/dialog/dialog.js
@@ -1,11 +1,3 @@
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
-
 export const DialogService = function() {
     let isOpen = false;
     let isInitialized = false;
@@ -16,7 +8,6 @@ export const DialogService = function() {
     const container = document.createElement('div');
     container.className = 'dialog-container';
     
-    // add dialog wrapper and container elements
     this.initialize = function() {
         const bodyElement = document.getElementsByTagName('body')[0];
         wrapper.appendChild(container);
diff --git a/src/modules/encryption/encryption.js b/src/modules/encryption/encryption.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/modules/index.js b/src/modules/index.js
new file mode 100644
index 0000000..ed74018
--- /dev/null
+++ b/src/modules/index.js
@@ -0,0 +1,9 @@
+export * from './database/db.js';
+export * from './dialog/dialog.js';
+export * from './encryption/encryption.js';
+export * from './leader-board/leader-board.js';
+export * from './loading/loading.js';
+export * from './logger/logger.js';
+export * from './storage/storage.js';
+export * from './timer/timer.js';
+export * from './user/user.js';
diff --git a/src/services/leader-board.service.js b/src/modules/leader-board/leader-board.js
similarity index 95%
rename from src/services/leader-board.service.js
rename to src/modules/leader-board/leader-board.js
index 584288c..30c8887 100644
--- a/src/services/leader-board.service.js
+++ b/src/modules/leader-board/leader-board.js
@@ -1,7 +1,7 @@
-import { DatabaseService } from "./db.service.js";
-import { TimerService } from "./timer.service.js";
-import { UserService } from "./user.service.js";
-import { LoadingService } from "./loading/loading.js";
+import { DatabaseService } from '../database/db';
+import { TimerService } from '../timer/timer';
+import { UserService } from '../user/user';
+import { LoadingService } from '../loading/loading';
 
 const dbService = new DatabaseService();
 const timerService = new TimerService();
@@ -63,6 +63,7 @@ export class LeaderBoardService {
                 this.unsubscribe();
             }
             this.lastPlace = Number.MAX_SAFE_INTEGER;
+            // todo: use 'where' to filter by day, week, month, and all-time
             this.topList = this.leaders.doc(level)
                 .collection('games').orderBy('time').limit(10);
             this.unsubscribe = this.setListener(this.topList, displayElement, title);
@@ -98,7 +99,7 @@ export class LeaderBoardService {
                     const name = game.data().name || 'Anonymous';
                     const item = document.createElement('div');
                     item.style.display = 'flex';
-                    const nameElement =document.createElement('div'); // `<span class="ellipsis" title="${name}">${name}</span>` ;
+                    const nameElement =document.createElement('div');
                     nameElement.innerHTML = name;
                     nameElement.setAttribute('title', name);
                     nameElement.style.textOverflow = 'ellipsis';
diff --git a/src/services/loading/loading.css b/src/modules/loading/loading.css
similarity index 100%
rename from src/services/loading/loading.css
rename to src/modules/loading/loading.css
diff --git a/src/services/loading/loading.js b/src/modules/loading/loading.js
similarity index 100%
rename from src/services/loading/loading.js
rename to src/modules/loading/loading.js
diff --git a/src/services/logger.service.js b/src/modules/logger/logger.js
similarity index 71%
rename from src/services/logger.service.js
rename to src/modules/logger/logger.js
index fd6b50c..feade34 100644
--- a/src/services/logger.service.js
+++ b/src/modules/logger/logger.js
@@ -1,11 +1,3 @@
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
-
 export class LoggerService {
     debug(message, data) {
         if (typeof message === 'string') {
diff --git a/src/services/storage.service.js b/src/modules/storage/storage.js
similarity index 77%
rename from src/services/storage.service.js
rename to src/modules/storage/storage.js
index cd6c954..5c413ff 100644
--- a/src/services/storage.service.js
+++ b/src/modules/storage/storage.js
@@ -1,11 +1,3 @@
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
-
 export class StorageService {
 
     constructor() {
diff --git a/src/services/timer.service.js b/src/modules/timer/timer.js
similarity index 88%
rename from src/services/timer.service.js
rename to src/modules/timer/timer.js
index 3b12776..3e8ddd7 100644
--- a/src/services/timer.service.js
+++ b/src/modules/timer/timer.js
@@ -1,12 +1,4 @@
-import { LoggerService } from "./logger.service.js";
-
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
+import { LoggerService } from "../logger/logger";
 
 const INTERVAL = 1;
 
@@ -30,7 +22,6 @@ export class TimerService {
     start() {
         if (this.running || !this.display) return;
 
-        // run timer
         this.running = true;
         this.startTime = new Date().getTime();
         this.id = window.setInterval(() => this.updateDisplay(), INTERVAL);
diff --git a/src/services/user.service.js b/src/modules/user/user.js
similarity index 100%
rename from src/services/user.service.js
rename to src/modules/user/user.js
diff --git a/src/services/encryption.service.js b/src/services/encryption.service.js
deleted file mode 100644
index e36ed83..0000000
--- a/src/services/encryption.service.js
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/*
-    Author: Ayo Ayco
-    Email: ramon.aycojr@gmail.com
-    Website: AyoAyco.com
-    Blog: FullHacker.com
-    Live: games.fullhacker.com/minesweeper
-*/
diff --git a/src/services/index.js b/src/services/index.js
deleted file mode 100644
index f7dd8d2..0000000
--- a/src/services/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './db.service';
-export * from './dialog.service';
-export * from './leader-board.service';
-export * from './loading/loading';
-export * from './logger.service';
-export * from './storage.service';
-export * from './timer.service';
-export * from './user.service';