diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a1c2a23..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..15e0e8e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,122 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## 0.4.2
+### Added
+- Unit edit page, you can mark and rename units
+- 7.2 units
+- Latest refresh time
+
+### Fixed
+- Calendar page
+
+## 0.4.1
+### Added
+- Gachas into calendar page
+
+## 0.4.0
+### Added
+- Calendar page, now you can view future stages and events in calendar form
+
+## 0.3.8
+### Added
+- Eggy gacha sets
+- Keep a local copy of event/gacha/item
+
+### Removed
+- Collab gacha sets from seed finding page
+- Irrelevant stage link
+
+### Fixed
+- Problem with collab rare
+
+## 0.3.7
+### Added
+- Filters in gacha and item page
+- Applet can now memorise your filter choice
+
+## 0.3.6
+### Added
+- Foresee items page
+
+### Removed
+- Redundant code
+- Outdated gacha sets
+- 7.1.0 gacha sets
+
+### Fixed
+- A bug where the app crashes when score = 0
+
+## 0.3.5
+### Fixed
+- Bug to all gacha sets making all uber/epic fests and iron league gacha set unreliable
+
+## 0.3.4
+### Added
+- More event groups to make the page cleaner
+
+### Changed
+- Thank page
+
+### Fixed
+- Bug in detect gaos page
+- Bug related to AC gacha set
+
+## 0.3.3
+### Added
+- AC gacha set
+
+### Changed
+- Group events to make event page clean
+- Make gacha set editor more convenient
+
+## 0.3.2
+### Added
+- Special thanks
+- Support English version of event and gacha reader
+
+## 0.3.1
+### Fixed
+- Bug where the program cannot read description properly
+
+## 0.3.0
+### Added
+- Access to Ponos future event and gacha information (Chinese only)
+
+changes in 0-2-6:
+	1. you can add new units now
+	2. fix a bug that it might crash if you didn't place cat of all rarity in DIY gacha set
+	3. it can read events in the future version. Then you can check it before Jones_Htog (he is always the earliest, though)
+
+changes in 0-2-5:
+	1. support Platinum Ticket
+	2. A for add in Gacha set edit page
+
+changes in 0-2-4: support 7.0 gacha
+
+changes in 0-2-3:
+	1. fix a naming bug in new set page
+	2. add cross-set track manage page
+	3. add multiple chart style choice
+
+changes in 0-2-3:
+	1. fix a naming bug in new set page
+	2. add cross-set track manage page
+	3. add multiple chart style choice
+
+changes in 0-2-2: fix minor bug
+
+changes in 0-2-1:
+	1. add DIY gacha set maker for people to figure out the new gacha sets.
+	2. fix bugs in multiple set seed finder page
+
+changes in 0-2-0:
+	1. add non-ordered seed finder for people who forget their draw order, but takes more draws to get seed.
+	2. add multiple set seed finder for people who draw in multiple sets and can't find seed in original seed finder.
+
+[Unreleased]: https://github.com/lcy0x1/BC-Tracker/compare/v0.4.2...HEAD
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..83a6c16
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# BC Tracker
diff --git a/change log/changes Ver 0-2.txt b/change log/changes Ver 0-2.txt
deleted file mode 100644
index 33f3d46..0000000
--- a/change log/changes Ver 0-2.txt	
+++ /dev/null
@@ -1,30 +0,0 @@
-changes in 0-2-6:
-	1. you can add new units now
-	2. fix a bug that it might crash if you didn't place cat of all rarity in DIY gacha set
-	3. it can read events in the future version. Then you can check it before Jones_Htog (he is always the earliest, though)
-
-changes in 0-2-5:
-	1. support Platinum Ticket
-	2. A for add in Gacha set edit page
-
-changes in 0-2-4: support 7.0 gacha
-
-changes in 0-2-3:
-	1. fix a naming bug in new set page
-	2. add cross-set track manage page
-	3. add multiple chart style choice
-
-changes in 0-2-3:
-	1. fix a naming bug in new set page
-	2. add cross-set track manage page
-	3. add multiple chart style choice
-
-changes in 0-2-2: fix minor bug
-
-changes in 0-2-1:
-	1. add DIY gacha set maker for people to figure out the new gacha sets.
-	2. fix bugs in multiple set seed finder page
-
-changes in 0-2-0:
-	1. add non-ordered seed finder for people who forget their draw order, but takes more draws to get seed.
-	2. add multiple set seed finder for people who draw in multiple sets and can't find seed in original seed finder.
\ No newline at end of file
diff --git a/change log/changes Ver 0-3.txt b/change log/changes Ver 0-3.txt
deleted file mode 100644
index b2e3af9..0000000
--- a/change log/changes Ver 0-3.txt	
+++ /dev/null
@@ -1,45 +0,0 @@
-major change in 0.3.8:
-	1. fix a problem about collab rare
-	2. add Eggy gacha sets (there are two sets, be aware)
-	3. remove collab gacha sets from seed finding page (that's troublesome)
-	4. keep a local copy of event/gacha/item
-	5. remove irelavent stage link		
-
-major change in 0.3.7:
-	1. add filters in gacha and item page
-	2. applet can memorize your filter choice now
-
-major changes in 0.3.6:
-	1. fix a bug that the app will crash when score=0
-	2. remove outdated gacha sets and add 7.1.0 gacha sets
-	3. add foresee items page
-	4. reduce redundant code
-
-major changes in 0.3.5:
-	fix the bug to ALL GACHA SETS (thanks u/CrazyMati1)
-	this bug will make all uber/epic fests and iron league gacha set EXTREMELY UNRELIABLE
-	this bug is caused in 0.3.3 (only effect AC set),
-	and become more serious in 0.3.4 (AC set is fixed, but problems transfer to other sets)
-	I'm sorry if this bug causes any tragedy
-
-major changes in 0.3.4:
-	1. fix bug in detect gaos page
-	2. add more event group to make the page cleaner
-	3. change thank page
-	4. fix bug related to AC gacha set (thanks u/turtlenatorv2)
-
-major changes in 0.3.3:
-	1. group events to make event page clean
-	2. make Gacha set editor more convenient
-	3. ADD AC GACHA SET!!!!!!!
-
-major changes in 0.3.2:
-	1. support English Version of Event & Gacha Reader
-	2. add special thanks
-
-major changes in 0.3.1:
-	fix the problem that program cannot read description properly
-
-major changes in 0.3.0:
-	able to access ponos future event and gacha information (only available in Chinese)
-	 
\ No newline at end of file
diff --git a/change log/changes Ver 0-4.txt b/change log/changes Ver 0-4.txt
deleted file mode 100644
index 8b17dfa..0000000
--- a/change log/changes Ver 0-4.txt	
+++ /dev/null
@@ -1,11 +0,0 @@
-major changes in 0.4.2:
-	1. add unit edit page, you can mark and rename units
-	2. add 7.2 units
-	3. add latest refresh time
-	4. fix bugs in calendar page
-
-major changes in 0.4.1:
-	add gachas into calendar page
-
-major changes in 0.4.0:
-	add calendar page, now you can view futures stages and events in calendar form
diff --git a/BC Tracker Ver 0-4-2.jar b/src/BC Tracker.jar
similarity index 100%
rename from BC Tracker Ver 0-4-2.jar
rename to src/BC Tracker.jar
diff --git a/lib/event ID.txt b/src/lib/event ID.txt
similarity index 95%
rename from lib/event ID.txt
rename to src/lib/event ID.txt
index 64b6371..9b34afb 100644
--- a/lib/event ID.txt	
+++ b/src/lib/event ID.txt	
@@ -1,191 +1,191 @@
-0	Speed Up Sale
-1	Treasure Radar Sale
-2	Rich Cat Sale
-3	Cat CPU Sale
-4	Cat Jobs Sale
-5	Sniper Cat Sale
-6	XP pack A Sale
-7	XP pack B Sale
-8	XP pack C Sale
-9	XP pack D Sale
-10	XP pack E Sale
-50	Line up Sale
-700	Catamin A Sale
-701	Catamin B Sale
-702	Catamin C Sale
-100	EoC Treasure Festival
-101	ItF Treasure Festival
-102	Weekend Stage Half Energy Cost
-104	CotC Treasure Festival
-105	Mystery Code 105 
-1000	Monday Stage
-1001	Tuesday Stage
-1002	Wednesday Stage
-1003	Thursday Stage
-1004	Friday Stage
-1027	Weekend Stage
-1028	XP Stage
-1059	XP Megablitz
-1124	XP Colosseum
-1155	Merciless XP
-1073	Monday Stage
-1074	Tuesday Stage
-1075	Wednesday Stage
-1076	Thursday Stage
-1077	Friday Stage
-1017	Crazed Cat
-1018	Crazed Tank
-1019	Crazed Axe
-1020	Crazed Gross
-1021	Crazed Cow
-1022	Crazed Bird
-1023	Crazed Fish
-1024	Crazed Lizard
-1025	Crazed Titan
-1102	Cat Maniac
-1103	Tank Maniac
-1104	Axe Maniac
-1105	Gross Maniac
-1106	Cow Maniac
-1107	Bird Maniac
-1108	Fish Maniac
-1109	Lizard Maniac
-1110	Titan Maniac
-1130	Li'l Cat Awakens
-1131	Li'l Tank Awakens
-1132	Li'l Axe Awakens
-1133	Li'l Gross Awakens
-1134	Li'l Cow Awakens
-1135	Li'l Bird Awakens
-1136	Li'l Fish Awakens
-1137	Li'l Lizard Awakens
-1138	Li'l Titan Awakens
-1097	Growing Green
-1098	Growing Purple
-1099	Growing Red
-1100	Growing Blue
-1101	Growing Yellow
-1049	The Dom Awakens
-1051	Panties Awakens
-1046	Kung-Fu Awakens
-1048	Bondage Awakens
-1054	Zombie Awakens
-1057	Boogie Awakens
-1055	Samurai Awakens
-1050	Box Cats Awaken
-1053	Ninja Awakens
-1047	Mr. Awakens
-1052	Tricycle Awakens
-1058	Skirt Awakens
-1056	Sumo Awakens
-1045	Actress Awakens
-1014	Red Cyclone
-1096	The Perfect Cyclone
-1015	Black Cyclone
-1066	Cosmic Cyclone
-1016	White Cyclone
-1039	Divine Cyclone
-1157	Super Cosmic Cyclone
-1043	Metal Cyclone
-1122	Zyclone
-1078	Facing Danger
-1007	Large Metal Hippo
-1006	Small Metal Hippo
-1011	Jan Cat
-1012	Feb Cat
-1013	Mar Cat
-1026	Apr Cat
-1029	May Cat
-1030	Jun Cat
-1031	Jul Cat
-1032	Aug Cat
-1036	Sep Cat
-1038	Oct Cat
-1009	Nov Cat
-1010	Dec Cat
-1083	Jan Cat Awakens
-1084	Feb Cat Awakens
-1085	Mar Cat Awakens
-1086	Apr Cat Awakens
-1087	May Cat Awakens
-1088	Jun Cat Awakens
-1089	Jul Cat Awakens
-1090	Aug Cat Awakens
-1091	Sep Cat Awakens
-1092	Oct Cat Awakens
-1093	Nov Cat Awakens
-1094	Dec Cat Awakens
-1119	Queen's Coronation
-1128	Dead on Debut
-1111	Red + Black Cyclones
-1095	Clionel Ascendant
-1114	Metal + Cosmic Cyclones
-1117	River Styx
-1112	White + Divine Cyclones
-1158	King Wahwah's Revenge
-1148	Flower Cat Awakens
-1150	Cavern of Comets
-1151	Island of Ash
-1152	Strait of Wings
-1162	Growing Strange
-1061	Dark Descent I
-1062	Dark Descent II
-1063	Dark Descent III
-1064	Dark Descent IV
-1069	Deadly Carnival I
-1120	Deadly Carnival II
-1161	Crazed Moneko
-1116	Mystery Package
-1118	Catfruit Buffet
-1033	Monthly Event All-Stars Special Celebration I
-1034	Monthly Event All-Stars Special Celebration II
-1035	Monthly Event All-Stars Special Celebration III
-1070	Monthly Event All-Stars Special Celebration IV
-1079	Monthly Event All-Stars Special Celebration V
-1146	Monthly Event All-Stars Special Celebration VI
-1140	Licky Ticket - The Midas Touch
-3000	EoC Ch.1 Half Energy Cost
-3001	EoC Ch.2 Half Energy Cost
-3002	EoC Ch.3 Half Energy Cost
-3003	ItF Ch.1 Half Energy Cost
-3004	ItF Ch.2 Half Energy Cost
-3005	ItF Ch.3 Half Energy Cost
-5000	Gamatoto XP festival I
-5001	Gamatoto XP festival II
-5002	Gamatoto XP festival III
-5003	Gamatoto Cateye Cave
-6000	Beginner's Arena
-7000	Heavenly Tower
-8000	Weekly Mission
-8001	Weekly Mission
-8002	Weekly Mission
-8003	Weekly Mission
-8004	Weekly Mission
-8005	Weekly Mission
-8006	Weekly Mission
-8007	Weekly Mission
-8008	Weekly Mission - Cat Fruit
-8009	Weekly Mission - SoL
-8010	Weekly Mission - Cat Fruit
-8011	Weekly Mission - SoL
-9000	Mission - 30F
-9028	Mission - 40F
-9072	Lucky Ticket Mission I
-9073	Lucky Ticket Mission II
-9074	Lucky Ticket Mission III
-11001	Black & Alien Arena
-12000	Challenge Stage
-14000	Night Growing Yellow
-14001	Night Growing Blue
-14002	Night Growing Red
-14003	Night Growing Purple
-14004	Night Growing Green
-14005	Night Facing Danger
-14006	Night Large Metal Hippo
-14007	Night Small Metal Hippo
-14008	Night Merciless XP
-14009	Night XP Colosseum
-14010	Night XP Megablitz
-14011	Night XP Stage
--8000	Certain Mission
+0	Speed Up Sale
+1	Treasure Radar Sale
+2	Rich Cat Sale
+3	Cat CPU Sale
+4	Cat Jobs Sale
+5	Sniper Cat Sale
+6	XP pack A Sale
+7	XP pack B Sale
+8	XP pack C Sale
+9	XP pack D Sale
+10	XP pack E Sale
+50	Line up Sale
+700	Catamin A Sale
+701	Catamin B Sale
+702	Catamin C Sale
+100	EoC Treasure Festival
+101	ItF Treasure Festival
+102	Weekend Stage Half Energy Cost
+104	CotC Treasure Festival
+105	Mystery Code 105 
+1000	Monday Stage
+1001	Tuesday Stage
+1002	Wednesday Stage
+1003	Thursday Stage
+1004	Friday Stage
+1027	Weekend Stage
+1028	XP Stage
+1059	XP Megablitz
+1124	XP Colosseum
+1155	Merciless XP
+1073	Monday Stage
+1074	Tuesday Stage
+1075	Wednesday Stage
+1076	Thursday Stage
+1077	Friday Stage
+1017	Crazed Cat
+1018	Crazed Tank
+1019	Crazed Axe
+1020	Crazed Gross
+1021	Crazed Cow
+1022	Crazed Bird
+1023	Crazed Fish
+1024	Crazed Lizard
+1025	Crazed Titan
+1102	Cat Maniac
+1103	Tank Maniac
+1104	Axe Maniac
+1105	Gross Maniac
+1106	Cow Maniac
+1107	Bird Maniac
+1108	Fish Maniac
+1109	Lizard Maniac
+1110	Titan Maniac
+1130	Li'l Cat Awakens
+1131	Li'l Tank Awakens
+1132	Li'l Axe Awakens
+1133	Li'l Gross Awakens
+1134	Li'l Cow Awakens
+1135	Li'l Bird Awakens
+1136	Li'l Fish Awakens
+1137	Li'l Lizard Awakens
+1138	Li'l Titan Awakens
+1097	Growing Green
+1098	Growing Purple
+1099	Growing Red
+1100	Growing Blue
+1101	Growing Yellow
+1049	The Dom Awakens
+1051	Panties Awakens
+1046	Kung-Fu Awakens
+1048	Bondage Awakens
+1054	Zombie Awakens
+1057	Boogie Awakens
+1055	Samurai Awakens
+1050	Box Cats Awaken
+1053	Ninja Awakens
+1047	Mr. Awakens
+1052	Tricycle Awakens
+1058	Skirt Awakens
+1056	Sumo Awakens
+1045	Actress Awakens
+1014	Red Cyclone
+1096	The Perfect Cyclone
+1015	Black Cyclone
+1066	Cosmic Cyclone
+1016	White Cyclone
+1039	Divine Cyclone
+1157	Super Cosmic Cyclone
+1043	Metal Cyclone
+1122	Zyclone
+1078	Facing Danger
+1007	Large Metal Hippo
+1006	Small Metal Hippo
+1011	Jan Cat
+1012	Feb Cat
+1013	Mar Cat
+1026	Apr Cat
+1029	May Cat
+1030	Jun Cat
+1031	Jul Cat
+1032	Aug Cat
+1036	Sep Cat
+1038	Oct Cat
+1009	Nov Cat
+1010	Dec Cat
+1083	Jan Cat Awakens
+1084	Feb Cat Awakens
+1085	Mar Cat Awakens
+1086	Apr Cat Awakens
+1087	May Cat Awakens
+1088	Jun Cat Awakens
+1089	Jul Cat Awakens
+1090	Aug Cat Awakens
+1091	Sep Cat Awakens
+1092	Oct Cat Awakens
+1093	Nov Cat Awakens
+1094	Dec Cat Awakens
+1119	Queen's Coronation
+1128	Dead on Debut
+1111	Red + Black Cyclones
+1095	Clionel Ascendant
+1114	Metal + Cosmic Cyclones
+1117	River Styx
+1112	White + Divine Cyclones
+1158	King Wahwah's Revenge
+1148	Flower Cat Awakens
+1150	Cavern of Comets
+1151	Island of Ash
+1152	Strait of Wings
+1162	Growing Strange
+1061	Dark Descent I
+1062	Dark Descent II
+1063	Dark Descent III
+1064	Dark Descent IV
+1069	Deadly Carnival I
+1120	Deadly Carnival II
+1161	Crazed Moneko
+1116	Mystery Package
+1118	Catfruit Buffet
+1033	Monthly Event All-Stars Special Celebration I
+1034	Monthly Event All-Stars Special Celebration II
+1035	Monthly Event All-Stars Special Celebration III
+1070	Monthly Event All-Stars Special Celebration IV
+1079	Monthly Event All-Stars Special Celebration V
+1146	Monthly Event All-Stars Special Celebration VI
+1140	Licky Ticket - The Midas Touch
+3000	EoC Ch.1 Half Energy Cost
+3001	EoC Ch.2 Half Energy Cost
+3002	EoC Ch.3 Half Energy Cost
+3003	ItF Ch.1 Half Energy Cost
+3004	ItF Ch.2 Half Energy Cost
+3005	ItF Ch.3 Half Energy Cost
+5000	Gamatoto XP festival I
+5001	Gamatoto XP festival II
+5002	Gamatoto XP festival III
+5003	Gamatoto Cateye Cave
+6000	Beginner's Arena
+7000	Heavenly Tower
+8000	Weekly Mission
+8001	Weekly Mission
+8002	Weekly Mission
+8003	Weekly Mission
+8004	Weekly Mission
+8005	Weekly Mission
+8006	Weekly Mission
+8007	Weekly Mission
+8008	Weekly Mission - Cat Fruit
+8009	Weekly Mission - SoL
+8010	Weekly Mission - Cat Fruit
+8011	Weekly Mission - SoL
+9000	Mission - 30F
+9028	Mission - 40F
+9072	Lucky Ticket Mission I
+9073	Lucky Ticket Mission II
+9074	Lucky Ticket Mission III
+11001	Black & Alien Arena
+12000	Challenge Stage
+14000	Night Growing Yellow
+14001	Night Growing Blue
+14002	Night Growing Red
+14003	Night Growing Purple
+14004	Night Growing Green
+14005	Night Facing Danger
+14006	Night Large Metal Hippo
+14007	Night Small Metal Hippo
+14008	Night Merciless XP
+14009	Night XP Colosseum
+14010	Night XP Megablitz
+14011	Night XP Stage
+-8000	Certain Mission
 -2000	Certain Collab
\ No newline at end of file
diff --git a/lib/gacha ID.txt b/src/lib/gacha ID.txt
similarity index 92%
rename from lib/gacha ID.txt
rename to src/lib/gacha ID.txt
index f9f3266..64f1ad8 100644
--- a/lib/gacha ID.txt	
+++ b/src/lib/gacha ID.txt	
@@ -1,24 +1,24 @@
-5	CATEYE
-6	li'l-cat
-11	li'l-cat
-215	LUGA6
-221	WARG7
-224	GLXY7
-230	SOUL7
-233	HERO6
-236	GODS6
-245	B.R10+1
-246	B.A9+1
-266	DRAG7
-273	B.M5*2+1
-276	POKM4
-280	F1.EPIC60+2
-283	IRLG5
-286	F0.UBER61+3
-289	DYNA7
-292	F0.UBER62+3
-293	F1.EPIC62+2
-294	PLA.62+8
-298	HERO7
-301	F0.UBER63+3
+5	CATEYE
+6	li'l-cat
+11	li'l-cat
+215	LUGA6
+221	WARG7
+224	GLXY7
+230	SOUL7
+233	HERO6
+236	GODS6
+245	B.R10+1
+246	B.A9+1
+266	DRAG7
+273	B.M5*2+1
+276	POKM4
+280	F1.EPIC60+2
+283	IRLG5
+286	F0.UBER61+3
+289	DYNA7
+292	F0.UBER62+3
+293	F1.EPIC62+2
+294	PLA.62+8
+298	HERO7
+301	F0.UBER63+3
 303	PLA.63+8
\ No newline at end of file
diff --git a/lib/gacha data.txt b/src/lib/gacha data.txt
similarity index 99%
rename from lib/gacha data.txt
rename to src/lib/gacha data.txt
index 995e8b2..496b98c 100644
--- a/lib/gacha data.txt	
+++ b/src/lib/gacha data.txt	
@@ -1,28 +1,28 @@
-LUGA6			377	376	325	307	308	240	199	198	197	171	170	169	168	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	34	33	32	31	30
-LUGA7			436	377	376	325	307	308	240	199	198	197	171	170	169	168	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	34	33	32	31	30
-DYNA7			427	377	376	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	143	59	57	44	43	42	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-WARG7			377	376	338	325	307	308	199	198	197	158	153	152	151	150	149	148	147	146	145	124	125	73	72	71	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-DRAG7			396	377	376	325	307	308	199	198	197	177	153	152	151	150	149	148	147	146	145	84	83	87	85	86	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-GLXY7			377	376	351	325	307	308	199	198	197	159	153	152	151	150	149	148	147	146	145	107	106	105	75	76	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-SOUL7			377	376	322	325	307	308	203	199	198	197	153	152	151	150	149	148	147	146	145	138	137	136	135	134	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-HERO7			431	377	376	325	307	308	261	226	212	199	198	197	196	195	194	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-GODS6			377	376	325	316	272	271	259	258	257	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-IRLG5			417	377	376	355	325	306	305	304	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-GIRL5			377	376	358	357	336	335	334	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-POKM4			401	377	376	361	360	359	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-BEST			333	306	306	259	259	196	196	137	137	84	84	76	76	71	71	43	43	240	240	377	376	239	238	237	200	144	131	129	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-B.R10+1			377	376	325	305	307	308	283	239	238	237	200	144	131	129	212	199	198	197	136	153	152	151	150	149	148	147	146	145	124	105	87	86	76	61	58	56	55	52	51	50	49	48	47	46	43	42	41	40	39	38	37	36	35	33	32	31	30
-B.A9+1			377	376	325	307	308	286	196	143	135	107	106	84	83	75	59	239	238	237	200	144	131	129	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-B.M5*2+1		397	316	316	261	261	170	170	138	138	57	57	377	376	332	332	332	314	314	314	276	276	276	228	228	228	239	238	237	200	144	131	131	131	129	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-F0.UBER64+3		436	431	427	417	401	396	380	377	376	361	360	359	355	351	338	325	322	318	316	306	305	304	307	308	272	271	269	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-F1.EPIC64+2		436	431	427	417	401	396	378	377	376	361	360	359	355	351	338	333	325	322	316	306	305	304	307	308	272	271	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-F0.UBER63+3		431	427	417	401	396	380	377	376	361	360	359	355	351	338	325	322	318	316	306	305	304	307	308	272	271	269	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-F1.EPIC63+2		431	427	417	401	396	378	377	376	361	360	359	355	351	338	333	325	322	316	306	305	304	307	308	272	271	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-F0.UBER62+3		427	417	401	396	380	377	376	361	360	359	355	351	338	325	322	318	316	306	305	304	307	308	272	271	269	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-F1.EPIC62+2		427	417	401	396	378	377	376	361	360	359	355	351	338	333	325	322	316	306	305	304	307	308	272	271	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
-PLA.64+8		436	431	427	417	401	397	396	380	378	361	360	359	355	351	338	333	322	318	316	306	305	304	286	283	269	34	168	169	170	171	240	42	43	44	57	59	143	71	72	73	124	125	158	75	76	105	106	107	159	83	84	85	86	87	177	134	135	136	137	138	203	194	195	196	212	226	261	257	258	259	271	272	
-PLA.63+8		431	427	417	401	397	396	380	378	361	360	359	355	351	338	333	322	318	316	306	305	304	286	283	269	34	168	169	170	171	240	42	43	44	57	59	143	71	72	73	124	125	158	75	76	105	106	107	159	83	84	85	86	87	177	134	135	136	137	138	203	194	195	196	212	226	261	257	258	259	271	272	
-PLA.62+8		427	417	401	397	396	380	378	361	360	359	355	351	338	333	322	318	316	306	305	304	286	283	269	34	168	169	170	171	240	42	43	44	57	59	143	71	72	73	124	125	158	75	76	105	106	107	159	83	84	85	86	87	177	134	135	136	137	138	203	194	195	196	212	226	261	257	258	259	271	272	
-C.AC			341	270	180	429	429	429	429	429	429	429	429	377	307	199	153	152	151	150	61	40	39	36	35	33	32	31	30	428	428	428	428	428	428	428	428	428	428	428	376	325	308	198	197	149	148	147	146	145	58	56	55	52	51	50	49	48	47	46	41	38	37	
-C.Eggy1			430	350	349	349	349	349	349	349	349	349	349	349	377	307	200	199	153	152	151	150	144	131	129	61	40	39	36	35	33	32	31	30	348	348	348	348	348	348	348	348	348	348	348	376	325	308	198	197	149	148	147	146	145	58	56	55	52	51	50	49	48	47	46	41	38	37	
-C.Eggy2			430	350	349	349	349	349	349	349	349	349	349	349	377	307	239	238	237	199	153	152	151	150	61	40	39	36	35	33	32	31	30	348	348	348	348	348	348	348	348	348	348	348	376	325	308	198	197	149	148	147	146	145	58	56	55	52	51	50	49	48	47	46	41	38	37	
+LUGA6			377	376	325	307	308	240	199	198	197	171	170	169	168	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	34	33	32	31	30
+LUGA7			436	377	376	325	307	308	240	199	198	197	171	170	169	168	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	34	33	32	31	30
+DYNA7			427	377	376	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	143	59	57	44	43	42	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+WARG7			377	376	338	325	307	308	199	198	197	158	153	152	151	150	149	148	147	146	145	124	125	73	72	71	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+DRAG7			396	377	376	325	307	308	199	198	197	177	153	152	151	150	149	148	147	146	145	84	83	87	85	86	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+GLXY7			377	376	351	325	307	308	199	198	197	159	153	152	151	150	149	148	147	146	145	107	106	105	75	76	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+SOUL7			377	376	322	325	307	308	203	199	198	197	153	152	151	150	149	148	147	146	145	138	137	136	135	134	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+HERO7			431	377	376	325	307	308	261	226	212	199	198	197	196	195	194	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+GODS6			377	376	325	316	272	271	259	258	257	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+IRLG5			417	377	376	355	325	306	305	304	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+GIRL5			377	376	358	357	336	335	334	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+POKM4			401	377	376	361	360	359	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+BEST			333	306	306	259	259	196	196	137	137	84	84	76	76	71	71	43	43	240	240	377	376	239	238	237	200	144	131	129	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+B.R10+1			377	376	325	305	307	308	283	239	238	237	200	144	131	129	212	199	198	197	136	153	152	151	150	149	148	147	146	145	124	105	87	86	76	61	58	56	55	52	51	50	49	48	47	46	43	42	41	40	39	38	37	36	35	33	32	31	30
+B.A9+1			377	376	325	307	308	286	196	143	135	107	106	84	83	75	59	239	238	237	200	144	131	129	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+B.M5*2+1		397	316	316	261	261	170	170	138	138	57	57	377	376	332	332	332	314	314	314	276	276	276	228	228	228	239	238	237	200	144	131	131	131	129	325	307	308	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+F0.UBER64+3		436	431	427	417	401	396	380	377	376	361	360	359	355	351	338	325	322	318	316	306	305	304	307	308	272	271	269	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+F1.EPIC64+2		436	431	427	417	401	396	378	377	376	361	360	359	355	351	338	333	325	322	316	306	305	304	307	308	272	271	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+F0.UBER63+3		431	427	417	401	396	380	377	376	361	360	359	355	351	338	325	322	318	316	306	305	304	307	308	272	271	269	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+F1.EPIC63+2		431	427	417	401	396	378	377	376	361	360	359	355	351	338	333	325	322	316	306	305	304	307	308	272	271	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+F0.UBER62+3		427	417	401	396	380	377	376	361	360	359	355	351	338	325	322	318	316	306	305	304	307	308	272	271	269	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+F1.EPIC62+2		427	417	401	396	378	377	376	361	360	359	355	351	338	333	325	322	316	306	305	304	307	308	272	271	34	42	43	44	57	59	71	72	73	75	76	83	84	85	86	87	105	106	107	124	125	134	135	136	137	138	143	158	159	168	169	170	171	177	194	195	196	203	212	226	261	240	257	258	259	200	144	131	129	237	238	239	199	198	197	153	152	151	150	149	148	147	146	145	61	58	56	55	52	51	50	49	48	47	46	41	40	39	38	37	36	35	33	32	31	30
+PLA.64+8		436	431	427	417	401	397	396	380	378	361	360	359	355	351	338	333	322	318	316	306	305	304	286	283	269	34	168	169	170	171	240	42	43	44	57	59	143	71	72	73	124	125	158	75	76	105	106	107	159	83	84	85	86	87	177	134	135	136	137	138	203	194	195	196	212	226	261	257	258	259	271	272	
+PLA.63+8		431	427	417	401	397	396	380	378	361	360	359	355	351	338	333	322	318	316	306	305	304	286	283	269	34	168	169	170	171	240	42	43	44	57	59	143	71	72	73	124	125	158	75	76	105	106	107	159	83	84	85	86	87	177	134	135	136	137	138	203	194	195	196	212	226	261	257	258	259	271	272	
+PLA.62+8		427	417	401	397	396	380	378	361	360	359	355	351	338	333	322	318	316	306	305	304	286	283	269	34	168	169	170	171	240	42	43	44	57	59	143	71	72	73	124	125	158	75	76	105	106	107	159	83	84	85	86	87	177	134	135	136	137	138	203	194	195	196	212	226	261	257	258	259	271	272	
+C.AC			341	270	180	429	429	429	429	429	429	429	429	377	307	199	153	152	151	150	61	40	39	36	35	33	32	31	30	428	428	428	428	428	428	428	428	428	428	428	376	325	308	198	197	149	148	147	146	145	58	56	55	52	51	50	49	48	47	46	41	38	37	
+C.Eggy1			430	350	349	349	349	349	349	349	349	349	349	349	377	307	200	199	153	152	151	150	144	131	129	61	40	39	36	35	33	32	31	30	348	348	348	348	348	348	348	348	348	348	348	376	325	308	198	197	149	148	147	146	145	58	56	55	52	51	50	49	48	47	46	41	38	37	
+C.Eggy2			430	350	349	349	349	349	349	349	349	349	349	349	377	307	239	238	237	199	153	152	151	150	61	40	39	36	35	33	32	31	30	348	348	348	348	348	348	348	348	348	348	348	376	325	308	198	197	149	148	147	146	145	58	56	55	52	51	50	49	48	47	46	41	38	37	
diff --git a/lib/group event.txt b/src/lib/group event.txt
similarity index 93%
rename from lib/group event.txt
rename to src/lib/group event.txt
index ec7b34a..12189a7 100644
--- a/lib/group event.txt	
+++ b/src/lib/group event.txt	
@@ -1,132 +1,132 @@
-12	P.MON
--2	-2	1	1011
--2	-2	1	1012
--2	-2	1	1013
--2	-2	1	1026
--2	-2	1	1029
--2	-2	1	1030
--2	-2	1	1031
--2	-2	1	1032
--2	-2	1	1036
--2	-2	1	1038
--2	-2	1	1009
--2	-2	1	1010
-12	P.MONA
--2	-2	1	1083
--2	-2	1	1084
--2	-2	1	1085
--2	-2	1	1086
--2	-2	1	1087
--2	-2	1	1088
--2	-2	1	1089
--2	-2	1	1090
--2	-2	1	1091
--2	-2	1	1092
--2	-2	1	1093
--2	-2	1	1094
-14	P.EXA
--2	-2	1	1049
--2	-2	1	1051
--2	-2	1	1046
--2	-2	1	1048
--2	-2	1	1054
--2	-2	1	1057
--2	-2	1	1055
--2	-2	1	1050
--2	-2	1	1053
--2	-2	1	1047
--2	-2	1	1052
--2	-2	1	1058
--2	-2	1	1056
--2	-2	1	1045
-9	P.CRA
--2	-2	2	1017	1102
--2	-2	2	1018	1103
--2	-2	2	1019	1104
--2	-2	2	1020	1105
--2	-2	2	1021	1106
--2	-2	2	1022	1107
--2	-2	2	1023	1108
--2	-2	2	1024	1109
--2	-2	2	1025	1110
-9	P.LIL
--2	-2	1	1130
--2	-2	1	1131
--2	-2	1	1132
--2	-2	1	1133
--2	-2	1	1134
--2	-2	1	1135
--2	-2	1	1136
--2	-2	1	1137
--2	-2	1	1138
-5	P.ITCF
--2	-2	2	1000	1097
--2	-2	2	1001	1098
--2	-2	2	1002	1099
--2	-2	2	1003	1100
--2	-2	2	1004	1101
-5	P.BLIT
--2	-2	1	1073
--2	-2	1	1074
--2	-2	1	1075
--2	-2	1	1076
--2	-2	1	1077
-7	P.MCLS
--2	-2	1	1119
--2	-2	1	1128
--2	-2	2	1111	1158
--2	-2	1	1095
--2	-2	1	1114
--2	-2	1	1117
--2	-2	1	1112
-8	P.MCLS
--2	-2	1	1119
--2	-2	1	1128
--2	-2	1	1111
--2	-2	1	1095
--2	-2	1	1114
--2	-2	1	1117
--2	-2	1	1112
--2	-2	1	1158
-9	P.CYC
--2	-2	1	1014
--2	-2	1	1015
--2	-2	1	1016
--2	-2	1	1039
--2	-2	1	1043
--2	-2	1	1066
--2	-2	1	1096
--2	-2	1	1122
--2	-2	1	1157
-1	P.SALE
--2	-2	9	0	1	2	3	4	5	700	701	702
-1	P.SALE
--2	-2	14	0	1	2	3	4	5	6	7	8	9	10	700	701	702
-1	P.NIT
--2	-2	12	14000	14001	14002	14003	14004	14005	14006	14007	14008	14009	14010	14011
-3	F.CM
-0	1	6	1017	1020	1023	1102	1105	1108
-1	2	6	1018	1021	1024	1103	1106	1109
-2	3	6	1019	1022	1025	1104	1107	1110
-3	F.LIL
-0	1	3	1130	1133	1136
-1	2	3	1131	1134	1137
-2	3	3	1132	1135	1138
-2	TOWER
-0	14	1	7000
-0	14	2	9000	9028
-1	WM.CF
-0	7	10	8000	8001	8002	8003	8004	8005	8006	8007	8008	8010
-1	WM.SoL
-0	7	10	8000	8001	8002	8003	8004	8005	8006	8007	8009	8011
-1	F.CF
-0	2	5	1097	1098	1099	1100	1101
-3	F.TREA
-0	-1	1	100
-0	-1	1	101
-0	-1	1	104
-4	F.DARK
-0	14	1	1061
-3	14	1	1062
-6	14	1	1063
+12	P.MON
+-2	-2	1	1011
+-2	-2	1	1012
+-2	-2	1	1013
+-2	-2	1	1026
+-2	-2	1	1029
+-2	-2	1	1030
+-2	-2	1	1031
+-2	-2	1	1032
+-2	-2	1	1036
+-2	-2	1	1038
+-2	-2	1	1009
+-2	-2	1	1010
+12	P.MONA
+-2	-2	1	1083
+-2	-2	1	1084
+-2	-2	1	1085
+-2	-2	1	1086
+-2	-2	1	1087
+-2	-2	1	1088
+-2	-2	1	1089
+-2	-2	1	1090
+-2	-2	1	1091
+-2	-2	1	1092
+-2	-2	1	1093
+-2	-2	1	1094
+14	P.EXA
+-2	-2	1	1049
+-2	-2	1	1051
+-2	-2	1	1046
+-2	-2	1	1048
+-2	-2	1	1054
+-2	-2	1	1057
+-2	-2	1	1055
+-2	-2	1	1050
+-2	-2	1	1053
+-2	-2	1	1047
+-2	-2	1	1052
+-2	-2	1	1058
+-2	-2	1	1056
+-2	-2	1	1045
+9	P.CRA
+-2	-2	2	1017	1102
+-2	-2	2	1018	1103
+-2	-2	2	1019	1104
+-2	-2	2	1020	1105
+-2	-2	2	1021	1106
+-2	-2	2	1022	1107
+-2	-2	2	1023	1108
+-2	-2	2	1024	1109
+-2	-2	2	1025	1110
+9	P.LIL
+-2	-2	1	1130
+-2	-2	1	1131
+-2	-2	1	1132
+-2	-2	1	1133
+-2	-2	1	1134
+-2	-2	1	1135
+-2	-2	1	1136
+-2	-2	1	1137
+-2	-2	1	1138
+5	P.ITCF
+-2	-2	2	1000	1097
+-2	-2	2	1001	1098
+-2	-2	2	1002	1099
+-2	-2	2	1003	1100
+-2	-2	2	1004	1101
+5	P.BLIT
+-2	-2	1	1073
+-2	-2	1	1074
+-2	-2	1	1075
+-2	-2	1	1076
+-2	-2	1	1077
+7	P.MCLS
+-2	-2	1	1119
+-2	-2	1	1128
+-2	-2	2	1111	1158
+-2	-2	1	1095
+-2	-2	1	1114
+-2	-2	1	1117
+-2	-2	1	1112
+8	P.MCLS
+-2	-2	1	1119
+-2	-2	1	1128
+-2	-2	1	1111
+-2	-2	1	1095
+-2	-2	1	1114
+-2	-2	1	1117
+-2	-2	1	1112
+-2	-2	1	1158
+9	P.CYC
+-2	-2	1	1014
+-2	-2	1	1015
+-2	-2	1	1016
+-2	-2	1	1039
+-2	-2	1	1043
+-2	-2	1	1066
+-2	-2	1	1096
+-2	-2	1	1122
+-2	-2	1	1157
+1	P.SALE
+-2	-2	9	0	1	2	3	4	5	700	701	702
+1	P.SALE
+-2	-2	14	0	1	2	3	4	5	6	7	8	9	10	700	701	702
+1	P.NIT
+-2	-2	12	14000	14001	14002	14003	14004	14005	14006	14007	14008	14009	14010	14011
+3	F.CM
+0	1	6	1017	1020	1023	1102	1105	1108
+1	2	6	1018	1021	1024	1103	1106	1109
+2	3	6	1019	1022	1025	1104	1107	1110
+3	F.LIL
+0	1	3	1130	1133	1136
+1	2	3	1131	1134	1137
+2	3	3	1132	1135	1138
+2	TOWER
+0	14	1	7000
+0	14	2	9000	9028
+1	WM.CF
+0	7	10	8000	8001	8002	8003	8004	8005	8006	8007	8008	8010
+1	WM.SoL
+0	7	10	8000	8001	8002	8003	8004	8005	8006	8007	8009	8011
+1	F.CF
+0	2	5	1097	1098	1099	1100	1101
+3	F.TREA
+0	-1	1	100
+0	-1	1	101
+0	-1	1	104
+4	F.DARK
+0	14	1	1061
+3	14	1	1062
+6	14	1	1063
 9	14	1	1064
\ No newline at end of file
diff --git a/lib/group hour.txt b/src/lib/group hour.txt
similarity index 97%
rename from lib/group hour.txt
rename to src/lib/group hour.txt
index e46e47c..5c91c77 100644
--- a/lib/group hour.txt	
+++ b/src/lib/group hour.txt	
@@ -1,11 +1,11 @@
-14	P.SALE	0	1	2	3	4	5	6	7	8	9	10	700	701	702
-12	P.NIT	14000	14001	14002	14003	14004	14005	14006	14007	14008	14009	14010	14011
-3	P.MAT	1150	1151	1152
-3	TOWER	7000	9000	9028
-10	WM.CF	8000	8001	8002	8003	8004	8005	8006	8007	8008	8010
-10	WM.SoL	8000	8001	8002	8003	8004	8005	8006	8007	8009	8011
-5	F.CF	1097	1098	1099	1100	1101
-4	F.DARK	1061	1062	1063	1064
-6	F.CM	1017	1020	1023	1102	1105	1108
-6	F.CM	1018	1021	1024	1103	1106	1109
+14	P.SALE	0	1	2	3	4	5	6	7	8	9	10	700	701	702
+12	P.NIT	14000	14001	14002	14003	14004	14005	14006	14007	14008	14009	14010	14011
+3	P.MAT	1150	1151	1152
+3	TOWER	7000	9000	9028
+10	WM.CF	8000	8001	8002	8003	8004	8005	8006	8007	8008	8010
+10	WM.SoL	8000	8001	8002	8003	8004	8005	8006	8007	8009	8011
+5	F.CF	1097	1098	1099	1100	1101
+4	F.DARK	1061	1062	1063	1064
+6	F.CM	1017	1020	1023	1102	1105	1108
+6	F.CM	1018	1021	1024	1103	1106	1109
 6	F.CM	1019	1022	1025	1104	1107	1110
\ No newline at end of file
diff --git a/lib/item ID.txt b/src/lib/item ID.txt
similarity index 94%
rename from lib/item ID.txt
rename to src/lib/item ID.txt
index 2de6b72..7a322f7 100644
--- a/lib/item ID.txt	
+++ b/src/lib/item ID.txt	
@@ -1,19 +1,19 @@
-0	Speed Up
-1	Treasure Radar
-2	Rich Cat
-3	Cat CPU
-4	Cat Jobs
-5	Sniper Cat
-200	Cat Food
-201	XP
-202	silver ticket
-203	gold ticket
-300	long pop up
-301	30 discount
-302	750 discount
-303	large pop up
-800	item bargain sale
-801	cat fruit bargain sale
-802	rare ticket sale
-803	platinum ticket sale
+0	Speed Up
+1	Treasure Radar
+2	Rich Cat
+3	Cat CPU
+4	Cat Jobs
+5	Sniper Cat
+200	Cat Food
+201	XP
+202	silver ticket
+203	gold ticket
+300	long pop up
+301	30 discount
+302	750 discount
+303	large pop up
+800	item bargain sale
+801	cat fruit bargain sale
+802	rare ticket sale
+803	platinum ticket sale
 804 beginner sale	
\ No newline at end of file
diff --git a/lib/unit data.txt b/src/lib/unit data.txt
similarity index 85%
rename from lib/unit data.txt
rename to src/lib/unit data.txt
index 2095887..7434031 100644
--- a/lib/unit data.txt	
+++ b/src/lib/unit data.txt	
@@ -1,158 +1,158 @@
-30	1
-31	1
-32	1
-33	1
-34	2
-35	1
-36	1
-37	0
-38	0
-39	1
-40	1
-41	0
-42	2
-43	2
-44	2
-46	0
-47	0
-48	0
-49	0
-50	0
-51	0
-52	0
-55	0
-56	0
-57	2
-58	0
-59	2
-61	1
-71	2
-72	2
-73	2
-75	2
-76	2
-83	2
-84	2
-85	2
-86	2
-87	2
-105	2
-106	2
-107	2
-124	2
-125	2
-129	1
-131	1
-134	2
-135	2
-136	2
-137	2
-138	2
-143	2
-144	1
-145	0
-146	0
-147	0
-148	0
-149	0
-150	1
-151	1
-152	1
-153	1
-158	2
-159	2
-168	2
-169	2
-170	2
-171	2
-177	2
-194	2
-195	2
-196	2
-197	0
-198	0
-199	1
-200	1
-203	2
-212	2
-226	2
-228	1
-229	2
-230	2
-237	1
-238	1
-239	1
-240	2
-241	2
-242	2
-243	2
-257	2
-258	2
-259	2
-261	2
-269	3
-271	2
-272	2
-274	2
-275	2
-276	1
-283	2
-286	2
-304	2
-305	2
-306	2
-307	1
-308	0
-310	2
-314	1
-316	2
-318	3
-322	2
-325	0
-330	2
-331	2
-332	1
-333	3
-334	2
-335	2
-336	2
-338	2
-351	2
-354	2
-355	2
-357	2
-358	2
-359	2
-360	2
-361	2
-376	0
-377	1
-378	3
-380	3
-396	2
-397	2
-401	2
-406	0
-407	0
-408	0
-409	1
-410	1
-411	1
-412	2
-413	2
-414	2
-415	2
-416	2
-417	2
-427	2
-431	2
-180	2
-270	2
-341	2
-429	1
-428	0
-348	0
-349	1
-350	2
-430	2
-436	2
+30	1
+31	1
+32	1
+33	1
+34	2
+35	1
+36	1
+37	0
+38	0
+39	1
+40	1
+41	0
+42	2
+43	2
+44	2
+46	0
+47	0
+48	0
+49	0
+50	0
+51	0
+52	0
+55	0
+56	0
+57	2
+58	0
+59	2
+61	1
+71	2
+72	2
+73	2
+75	2
+76	2
+83	2
+84	2
+85	2
+86	2
+87	2
+105	2
+106	2
+107	2
+124	2
+125	2
+129	1
+131	1
+134	2
+135	2
+136	2
+137	2
+138	2
+143	2
+144	1
+145	0
+146	0
+147	0
+148	0
+149	0
+150	1
+151	1
+152	1
+153	1
+158	2
+159	2
+168	2
+169	2
+170	2
+171	2
+177	2
+194	2
+195	2
+196	2
+197	0
+198	0
+199	1
+200	1
+203	2
+212	2
+226	2
+228	1
+229	2
+230	2
+237	1
+238	1
+239	1
+240	2
+241	2
+242	2
+243	2
+257	2
+258	2
+259	2
+261	2
+269	3
+271	2
+272	2
+274	2
+275	2
+276	1
+283	2
+286	2
+304	2
+305	2
+306	2
+307	1
+308	0
+310	2
+314	1
+316	2
+318	3
+322	2
+325	0
+330	2
+331	2
+332	1
+333	3
+334	2
+335	2
+336	2
+338	2
+351	2
+354	2
+355	2
+357	2
+358	2
+359	2
+360	2
+361	2
+376	0
+377	1
+378	3
+380	3
+396	2
+397	2
+401	2
+406	0
+407	0
+408	0
+409	1
+410	1
+411	1
+412	2
+413	2
+414	2
+415	2
+416	2
+417	2
+427	2
+431	2
+180	2
+270	2
+341	2
+429	1
+428	0
+348	0
+349	1
+350	2
+430	2
+436	2