diff --git a/src/game/global/global_variables.js b/src/game/lib/global/global_variables.js
similarity index 100%
rename from src/game/global/global_variables.js
rename to src/game/lib/global/global_variables.js
diff --git a/src/game/global/global_variables_debug.js b/src/game/lib/global/global_variables_debug.js
similarity index 100%
rename from src/game/global/global_variables_debug.js
rename to src/game/lib/global/global_variables_debug.js
diff --git a/src/game/global/global_variables_release.js b/src/game/lib/global/global_variables_release.js
similarity index 100%
rename from src/game/global/global_variables_release.js
rename to src/game/lib/global/global_variables_release.js
diff --git a/src/game/lib/announce_box.js b/src/game/lib/text/announce_box.js
similarity index 100%
rename from src/game/lib/announce_box.js
rename to src/game/lib/text/announce_box.js
diff --git a/src/game/lib/game_over_text.js b/src/game/lib/text/game_over_text.js
similarity index 100%
rename from src/game/lib/game_over_text.js
rename to src/game/lib/text/game_over_text.js
diff --git a/src/game/lib/how_to_play.js b/src/game/lib/text/how_to_play.js
similarity index 100%
rename from src/game/lib/how_to_play.js
rename to src/game/lib/text/how_to_play.js
diff --git a/src/game/lib/input_type_text.js b/src/game/lib/text/input_type_text.js
similarity index 100%
rename from src/game/lib/input_type_text.js
rename to src/game/lib/text/input_type_text.js
diff --git a/src/game/lib/score_board.js b/src/game/lib/text/score_board.js
similarity index 100%
rename from src/game/lib/score_board.js
rename to src/game/lib/text/score_board.js
diff --git a/src/game/lib/score_text.js b/src/game/lib/text/score_text.js
similarity index 100%
rename from src/game/lib/score_text.js
rename to src/game/lib/text/score_text.js
diff --git a/src/game/lib/screen_bottom_ui.js b/src/game/lib/text/screen_bottom_ui.js
similarity index 100%
rename from src/game/lib/screen_bottom_ui.js
rename to src/game/lib/text/screen_bottom_ui.js
diff --git a/src/game/lib/screen_top_ui.js b/src/game/lib/text/screen_top_ui.js
similarity index 100%
rename from src/game/lib/screen_top_ui.js
rename to src/game/lib/text/screen_top_ui.js
diff --git a/src/game/lib/animal.js b/src/game/typing/lib/animal.js
similarity index 100%
rename from src/game/lib/animal.js
rename to src/game/typing/lib/animal.js
diff --git a/src/game/lib/animal_list.js b/src/game/typing/lib/animal_list.js
similarity index 100%
rename from src/game/lib/animal_list.js
rename to src/game/typing/lib/animal_list.js
diff --git a/src/web/client/ads.html b/src/web/client/ads.html
index 2fcccc3..32dd80d 100644
--- a/src/web/client/ads.html
+++ b/src/web/client/ads.html
@@ -37,25 +37,26 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/src/web/client/card_matching.html b/src/web/client/card_matching.html
index f9e716c..adab724 100644
--- a/src/web/client/card_matching.html
+++ b/src/web/client/card_matching.html
@@ -39,26 +39,27 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/web/client/dodge.html b/src/web/client/dodge.html
index a657f6a..9e4a4c3 100644
--- a/src/web/client/dodge.html
+++ b/src/web/client/dodge.html
@@ -39,25 +39,26 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/web/client/grilled_meat.html b/src/web/client/grilled_meat.html
index d5467f7..fdf0b76 100644
--- a/src/web/client/grilled_meat.html
+++ b/src/web/client/grilled_meat.html
@@ -39,26 +39,27 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/web/client/license_timer.html b/src/web/client/license_timer.html
index b7a9847..505c510 100644
--- a/src/web/client/license_timer.html
+++ b/src/web/client/license_timer.html
@@ -38,24 +38,25 @@
-
+
+
+
+
+
-
-
-
diff --git a/src/web/client/login.html b/src/web/client/login.html
index dee75ba..75e31a9 100644
--- a/src/web/client/login.html
+++ b/src/web/client/login.html
@@ -37,18 +37,19 @@
-
+
+
+
+
-
-
diff --git a/src/web/client/menu_app.html b/src/web/client/menu_app.html
index b78d26f..d6b9663 100644
--- a/src/web/client/menu_app.html
+++ b/src/web/client/menu_app.html
@@ -36,20 +36,21 @@
-
+
+
+
+
+
-
-
-
diff --git a/src/web/client/menu_app_play_free.html b/src/web/client/menu_app_play_free.html
index 669baac..daecf2c 100644
--- a/src/web/client/menu_app_play_free.html
+++ b/src/web/client/menu_app_play_free.html
@@ -37,20 +37,21 @@
-
+
+
+
+
+
-
-
-
diff --git a/src/web/client/menu_typing_practice.html b/src/web/client/menu_typing_practice.html
index 4f454de..c1d9093 100644
--- a/src/web/client/menu_typing_practice.html
+++ b/src/web/client/menu_typing_practice.html
@@ -36,24 +36,25 @@
-
+
+
+
+
+
-
-
-
-
+
diff --git a/src/web/client/menu_typing_test.html b/src/web/client/menu_typing_test.html
index 69b4a90..bc9be26 100644
--- a/src/web/client/menu_typing_test.html
+++ b/src/web/client/menu_typing_test.html
@@ -36,24 +36,25 @@
-
+
+
+
+
+
-
-
-
-
+
diff --git a/src/web/client/ranking.html b/src/web/client/ranking.html
index bbe0517..7b971e9 100644
--- a/src/web/client/ranking.html
+++ b/src/web/client/ranking.html
@@ -38,24 +38,25 @@
-
+
+
+
+
+
+
-
-
-
-
-
+
diff --git a/src/web/client/result.html b/src/web/client/result.html
index 2fb8f27..771ff18 100644
--- a/src/web/client/result.html
+++ b/src/web/client/result.html
@@ -17,7 +17,7 @@
-
+
@@ -25,18 +25,19 @@
+
+
+
+
+
-
-
-
-
-
+
diff --git a/src/web/client/space_invaders.html b/src/web/client/space_invaders.html
index 64a1b7d..5721ecb 100644
--- a/src/web/client/space_invaders.html
+++ b/src/web/client/space_invaders.html
@@ -39,26 +39,27 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/web/client/start.html b/src/web/client/start.html
index f418829..7c29781 100644
--- a/src/web/client/start.html
+++ b/src/web/client/start.html
@@ -17,7 +17,7 @@
-
+
@@ -25,18 +25,19 @@
+
+
+
+
+
+
-
-
-
-
-
diff --git a/src/web/client/typing_practice.html b/src/web/client/typing_practice.html
index e3b4a3b..5a7cf31 100644
--- a/src/web/client/typing_practice.html
+++ b/src/web/client/typing_practice.html
@@ -39,7 +39,7 @@
-
+
@@ -47,20 +47,19 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
@@ -91,6 +90,8 @@
+
+
diff --git a/src/web/client/typing_test.html b/src/web/client/typing_test.html
index 0fdf602..8dd1603 100644
--- a/src/web/client/typing_test.html
+++ b/src/web/client/typing_test.html
@@ -39,26 +39,25 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
@@ -85,6 +84,8 @@
+
+
diff --git a/src/web/client/whac_a_mole.html b/src/web/client/whac_a_mole.html
index 1fbaeef..093e3f0 100644
--- a/src/web/client/whac_a_mole.html
+++ b/src/web/client/whac_a_mole.html
@@ -39,7 +39,7 @@
-
+
@@ -47,19 +47,20 @@
+
+
+
+
+
+
+
-
-
-
-
-
-