diff --git a/MainWin.py b/MainWin.py
deleted file mode 100644
index adb4784..0000000
--- a/MainWin.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from api.courseTable.courseTable import CourseTable
-from tkinter import * 
-from Moodle import createMoodleWin as moodleWin
-from Ncnu import createNcnuWin as ncnuWin 
-from NcnuMainWin import createNcnuMainWin as ncnuMainWin
-from courseTable import callTable
-from rigestryWin import createRigestryWin as rigestryWin
-
-def createMainWin(win,ncnu,moodle):
-    '''
-    用綠色校園作為基底色
-    以暨大的三大特色
-    1.穿山甲-moodle
-    2.櫻花-暨大官網 #ffcccc
-    3.國際性-教務系統
-    去做三個網頁的底色
-    '''
-    
-    
-
-    win.configure(bg="#b2ffa6")
-
-
-    createMoodleWin=Button(win,text="Moodle",font="Helvetica 30",bg="#888084",fg="white",relief=GROOVE)
-    createNcnuMainWin=Button(win,text="暨大官網",font="Helvetica 30",bg="#ffcccc",fg="white",relief=GROOVE)
-    createNcnuWin=Button(win,text="暨大教務系統",font="Helvetica 30",bg="#df99ff",fg="white",relief=GROOVE)
-    createTable=Button(win,text="自己課表自己排",font="Helvetica 30",bg="blue",fg="white",relief=GROOVE,command=lambda:callTable())
-    createRigestryWin=Button(win,text="查詢活動報名資料",font="Helvetica 30",bg="black",fg="white",relief=GROOVE)
-
-    createMoodleWin.config(command=lambda:moodleWin(moodle) )
-    createNcnuMainWin.config(command=lambda:ncnuMainWin() )
-    createNcnuWin.config(command=lambda:ncnuWin(ncnu) )
-    createRigestryWin.config(command=lambda:rigestryWin())
-
-    
-    createMoodleWin.pack(fill="x")
-    createNcnuMainWin.pack(fill="x")
-    createNcnuWin.pack(fill="x")
-    createTable.pack(fill="x")
-    createRigestryWin.pack(fill="x")
-
-    win.mainloop()
-
-
diff --git a/MainTkinter.py b/main.py
similarity index 85%
rename from MainTkinter.py
rename to main.py
index 8edc463..396ff6a 100644
--- a/MainTkinter.py
+++ b/main.py
@@ -1,10 +1,10 @@
 from tkinter import *
-from firstpage import *
-from MainWin import *
+from wins.firstpage import *
+from wins.MainWin import *
 from config import CONFIG
-from Ncnu import *
-from Moodle import *
-from NcnuMainWin import *
+from wins.Ncnu import *
+from wins.Moodle import *
+from wins.NcnuMainWin import *
 from api.moodle import MoodleAPI
 from api.ncnu import NcnuAPI
 import threading
diff --git a/wins/MainWin.py b/wins/MainWin.py
index f39f85f..cba698a 100644
--- a/wins/MainWin.py
+++ b/wins/MainWin.py
@@ -1,6 +1,12 @@
+from api.courseTable.courseTable import CourseTable
 from tkinter import * 
+from wins.Moodle import createMoodleWin as moodleWin
+from wins.Ncnu import createNcnuWin as ncnuWin 
+from wins.NcnuMainWin import createNcnuMainWin as ncnuMainWin
+from wins.courseTable import callTable
+from wins.rigestryWin import createRigestryWin as rigestryWin
 
-def createMainWin():
+def createMainWin(win,ncnu,moodle):
     '''
     用綠色校園作為基底色
     以暨大的三大特色
@@ -9,18 +15,30 @@ def createMainWin():
     3.國際性-教務系統
     去做三個網頁的底色
     '''
-    win=Tk()
+    
+    
+
     win.configure(bg="#b2ffa6")
 
 
     createMoodleWin=Button(win,text="Moodle",font="Helvetica 30",bg="#888084",fg="white",relief=GROOVE)
     createNcnuMainWin=Button(win,text="暨大官網",font="Helvetica 30",bg="#ffcccc",fg="white",relief=GROOVE)
     createNcnuWin=Button(win,text="暨大教務系統",font="Helvetica 30",bg="#df99ff",fg="white",relief=GROOVE)
+    createTable=Button(win,text="自己課表自己排",font="Helvetica 30",bg="blue",fg="white",relief=GROOVE,command=lambda:callTable())
+    createRigestryWin=Button(win,text="查詢活動報名資料",font="Helvetica 30",bg="black",fg="white",relief=GROOVE)
+
+    createMoodleWin.config(command=lambda:moodleWin(moodle) )
+    createNcnuMainWin.config(command=lambda:ncnuMainWin() )
+    createNcnuWin.config(command=lambda:ncnuWin(ncnu) )
+    createRigestryWin.config(command=lambda:rigestryWin())
+
     
+    createMoodleWin.pack(fill="x")
     createNcnuMainWin.pack(fill="x")
     createNcnuWin.pack(fill="x")
-    createMoodleWin.pack(fill="x")
+    createTable.pack(fill="x")
+    createRigestryWin.pack(fill="x")
 
     win.mainloop()
 
-createMainWin()
+
diff --git a/Moodle.py b/wins/Moodle.py
similarity index 100%
rename from Moodle.py
rename to wins/Moodle.py
diff --git a/Ncnu.py b/wins/Ncnu.py
similarity index 100%
rename from Ncnu.py
rename to wins/Ncnu.py
diff --git a/NcnuMainWin.py b/wins/NcnuMainWin.py
similarity index 100%
rename from NcnuMainWin.py
rename to wins/NcnuMainWin.py
diff --git a/courseTable.py b/wins/courseTable.py
similarity index 100%
rename from courseTable.py
rename to wins/courseTable.py
diff --git a/firstpage.py b/wins/firstpage.py
similarity index 99%
rename from firstpage.py
rename to wins/firstpage.py
index 866fcc1..0fc2695 100644
--- a/firstpage.py
+++ b/wins/firstpage.py
@@ -5,7 +5,7 @@ import json
 from api.moodle import MoodleAPI
 from tkinter import messagebox
 from api.ncnu import NcnuAPI
-from MainWin import *
+from wins.MainWin import *
 
 
 def firstWin(first):
diff --git a/rigestryWin.py b/wins/rigestryWin.py
similarity index 100%
rename from rigestryWin.py
rename to wins/rigestryWin.py