diff --git a/src/client/commands/list.js b/src/client/commands/list.js
index 70ba290..00d73b9 100644
--- a/src/client/commands/list.js
+++ b/src/client/commands/list.js
@@ -7,7 +7,7 @@ module.exports = {
     execute(interaction, client) {
         let message = {};
 
-        if(!client.stations) {
+        if(!client.stations.list) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply({
                 content: client.messageEmojis["error"] + message.errorToGetPlaylist,
@@ -20,7 +20,7 @@ module.exports = {
         if(radio && !client.config.maintenanceMode){
             client.funcs.listStations(client, interaction);
         } else {
-            let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
+            let stations = `${client.stations.list.map(s => `**#** ${s.name}`).join('\n')}`
             const hashs = stations.split('**#**').length;
             for (let i = 0; i < hashs; i++) {
                 stations = stations.replace('**#**', `**${i + 1}.**`);
diff --git a/src/client/commands/maintenance.js b/src/client/commands/maintenance.js
index 9530568..d9d3547 100644
--- a/src/client/commands/maintenance.js
+++ b/src/client/commands/maintenance.js
@@ -111,14 +111,14 @@ module.exports = {
             case "4":
                 client.config.maintenanceMode = true;
                 client.user.setStatus('idle');
-                client.funcs.saveRadios(client);
+                client.radio.save(client);
                 client.user.setStatus('online');
                 client.config.maintenanceMode = false;
                 break;
             case "5":
                 client.config.maintenanceMode = true;
                 client.user.setStatus('idle');
-                client.funcs.restoreRadios(client, guilds);
+                client.radio.restore(client, guilds);
                 client.user.setStatus('online');
                 client.config.maintenanceMode = false;
                 break;
@@ -131,17 +131,13 @@ module.exports = {
                 break;
             case "7":
                 try {
-                    client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
-                    client.stations = await fetch(client.config.stationslistUrl)
-                        .then(client.funcs.checkFetchStatus)
-                        .then(response => response.json());
-
-                    client.funcs.logger('Stations', 'Successfully fetched list');
-
+                    client.stations.fetch({
+                        url: client.config.stationslistUrl
+                    });
                     client.streamer.refresh(client);
 
                 } catch (error) {
-                    client.funcs.logger('Stations', 'Fetching list failed');
+
                 }
                 break;
             case "8":
@@ -167,7 +163,7 @@ module.exports = {
                         client.streamer = new Streamer();
                         client.streamer.init(client);
 
-                        client.funcs.restoreRadios(client, guilds);
+                        client.radio.restore(client, guilds);
                         client.user.setStatus('online');
                         client.config.maintenanceMode = false;
                     }
@@ -183,7 +179,7 @@ module.exports = {
                 client.config.maintenanceMode = true;
 
                 client.user.setStatus('idle');
-                client.funcs.saveRadios(client);
+                client.funcs.save(client);
 
                 setInterval(() => {
                     if(client.radio.size == 0 && client.config.streamerMode == "auto" && client.config.maintenanceMode){
@@ -191,7 +187,7 @@ module.exports = {
                         client.streamer = new Streamer();
                         client.streamer.init(client);
 
-                        client.funcs.restoreRadios(client, guilds);
+                        client.radio.restore(client, guilds);
                         client.user.setStatus('online');
                         client.config.maintenanceMode = false;
                     }
diff --git a/src/client/commands/next.js b/src/client/commands/next.js
index 345faa7..3f0114f 100644
--- a/src/client/commands/next.js
+++ b/src/client/commands/next.js
@@ -6,17 +6,17 @@ module.exports = {
         if (client.funcs.check(client, interaction, command)) {
             const radio = client.radio.get(interaction.guild.id);
 
-            let index = client.stations.findIndex(station => station.name == radio.station.name) + 1;
-            if(index == client.stations.length) index = 0;
+            let index = client.stations.list.findIndex(station => station.name == radio.station.name) + 1;
+            if(index == client.stations.list.length) index = 0;
 
-            let station = client.stations[index];
+            let station = client.stations.list[index];
 
             if(!station) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noSearchResults,
                 ephemeral: true
             });
 
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            client.statistics.update(client, interaction.guild, radio);
 
             let date = new Date();
             radio.station = station;
diff --git a/src/client/commands/play.js b/src/client/commands/play.js
index d8795dc..62b65a8 100644
--- a/src/client/commands/play.js
+++ b/src/client/commands/play.js
@@ -21,7 +21,7 @@ module.exports = {
             });
         }
 
-        if(!client.stations) {
+        if(!client.stations.list) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply({
                 content: client.messageEmojis["error"] + message.errorToGetPlaylist,
@@ -71,20 +71,20 @@ module.exports = {
                 ephemeral: true
             });
         } else if (!isNaN(number)) {
-            if (number > client.stations.length - 1) {
+            if (number > client.stations.list.length - 1) {
                 return interaction.reply({
                     content: client.messageEmojis["error"] + client.messages.wrongStationNumber,
                     ephemeral: true
                 });
             } else {
-                station = client.stations[number];
+                station = client.stations.list[number];
             }
         } else {
             if (query.length < 3) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.tooShortSearch,
                 ephemeral: true
             });
-            const sstation = await client.funcs.searchStation(query, client);
+            const sstation = await client.stations.search(query, client);
             if (!sstation) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noSearchResults,
                 ephemeral: true
@@ -93,7 +93,7 @@ module.exports = {
         }
 
         if (radio) {
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            client.statistics.update(client, interaction.guild, radio);
 
             let date = new Date();
             radio.station = station;
diff --git a/src/client/commands/prev.js b/src/client/commands/prev.js
index 3db911b..6189919 100644
--- a/src/client/commands/prev.js
+++ b/src/client/commands/prev.js
@@ -6,17 +6,17 @@ module.exports = {
         if (client.funcs.check(client, interaction, command)) {
             const radio = client.radio.get(interaction.guild.id);
 
-            let index = client.stations.findIndex(station => station.name == radio.station.name) - 1;
-            if(index == -1) index = client.stations.length - 1;
+            let index = client.stations.list.findIndex(station => station.name == radio.station.name) - 1;
+            if(index == -1) index = client.stations.list.length - 1;
 
-            let station = client.stations[index];
+            let station = client.stations.list[index];
 
             if(!station) return interaction.reply({
                 content: client.messageEmojis["error"] + client.messages.noSearchResults,
                 ephemeral: true
             });
 
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            client.statistics.update(client, interaction.guild, radio);
 
             let date = new Date();
             radio.station = station;
diff --git a/src/client/commands/statistics.js b/src/client/commands/statistics.js
index 56c533c..6c3f42b 100644
--- a/src/client/commands/statistics.js
+++ b/src/client/commands/statistics.js
@@ -7,12 +7,12 @@ module.exports = {
     category: 'info',
     execute(interaction, client) {
         let message = {};
-        let stations = client.stations;
+        let stations = client.stations.list;
         let currentGuild = client.datastore.getEntry(interaction.guild.id);
         let global = client.datastore.getEntry("global");
         let statistics = "";
 
-        if(!client.stations) {
+        if(!client.stations.list) {
             message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
             return interaction.reply({
                 content: client.messageEmojis["error"] + message.errorToGetPlaylist,
diff --git a/src/client/commands/stop.js b/src/client/commands/stop.js
index 84674fc..55d0212 100644
--- a/src/client/commands/stop.js
+++ b/src/client/commands/stop.js
@@ -7,7 +7,7 @@ module.exports = {
     async execute(interaction, client, command) {
         if (client.funcs.check(client, interaction, command)) {
             const radio = client.radio.get(interaction.guild.id);
-            client.funcs.statisticsUpdate(client, interaction.guild, radio);
+            client.statistics.update(client, interaction.guild, radio);
             radio.connection?.destroy();
             client.funcs.logger('Radio', interaction.guild.id + " / " + 'Stop');