diff --git a/highscores.py b/highscores.py
index 493e0bb..01b2cb1 100644
--- a/highscores.py
+++ b/highscores.py
@@ -9,9 +9,8 @@ import nextcord
 from nextcord.ext import commands
 
 import config
-from utilities.data_storage import open_highscores_config
-from utilities.data_storage import open_highscores_data
-from utilities.data_storage import create_message_map
+from utilities.highscores_data import HighscoresData
+from utilities.utils import create_message_map
 
 logger = logging.getLogger("nextcord")
 logger.setLevel(logging.DEBUG)
@@ -20,8 +19,7 @@ handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(me
 logger.addHandler(handler)
 
 
-highscores_config = open_highscores_config()
-highscores_data = open_highscores_data()
+highscores_data = HighscoresData()
 highscores_message_map = create_message_map(highscores_data)
 
 submission_objects: dict = {}