diff --git a/EchoTspServer/Program.cs b/EchoTspServer/Program.cs
index 5966c579..82721a2e 100644
--- a/EchoTspServer/Program.cs
+++ b/EchoTspServer/Program.cs
@@ -5,169 +5,168 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-/// <summary>
-/// This program was designed for test purposes only
-/// Not for a review
-/// </summary>
-public class EchoServer
+namespace EchoServer
 {
-    private readonly int _port;
-    private TcpListener _listener;
-    private CancellationTokenSource _cancellationTokenSource;
-
-
-    public EchoServer(int port)
+    public class EchoServer
     {
-        _port = port;
-        _cancellationTokenSource = new CancellationTokenSource();
-    }
+        private readonly int _port;
+        private TcpListener _listener;
+        private CancellationTokenSource _cancellationTokenSource;
 
-    public async Task StartAsync()
-    {
-        _listener = new TcpListener(IPAddress.Any, _port);
-        _listener.Start();
-        Console.WriteLine($"Server started on port {_port}.");
+        //constuctor
+        public EchoServer(int port)
+        {
+            _port = port;
+            _cancellationTokenSource = new CancellationTokenSource();
+        }
 
-        while (!_cancellationTokenSource.Token.IsCancellationRequested)
+        public async Task StartAsync()
         {
-            try
-            {
-                TcpClient client = await _listener.AcceptTcpClientAsync();
-                Console.WriteLine("Client connected.");
+            _listener = new TcpListener(IPAddress.Any, _port);
+            _listener.Start();
+            Console.WriteLine($"Server started on port {_port}.");
 
-                _ = Task.Run(() => HandleClientAsync(client, _cancellationTokenSource.Token));
-            }
-            catch (ObjectDisposedException)
+            while (!_cancellationTokenSource.Token.IsCancellationRequested)
             {
-                // Listener has been closed
-                break;
+                try
+                {
+                    TcpClient client = await _listener.AcceptTcpClientAsync();
+                    Console.WriteLine("Client connected.");
+
+                    _ = Task.Run(() => HandleClientAsync(client, _cancellationTokenSource.Token));
+                }
+                catch (ObjectDisposedException)
+                {
+                    // Listener has been closed
+                    break;
+                }
             }
-        }
 
-        Console.WriteLine("Server shutdown.");
-    }
+            Console.WriteLine("Server shutdown.");
+        }
 
-    private async Task HandleClientAsync(TcpClient client, CancellationToken token)
-    {
-        using (NetworkStream stream = client.GetStream())
+        private async Task HandleClientAsync(TcpClient client, CancellationToken token)
         {
-            try
+            using (NetworkStream stream = client.GetStream())
             {
-                byte[] buffer = new byte[8192];
-                int bytesRead;
-
-                while (!token.IsCancellationRequested && (bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, token)) > 0)
+                try
                 {
-                    // Echo back the received message
-                    await stream.WriteAsync(buffer, 0, bytesRead, token);
-                    Console.WriteLine($"Echoed {bytesRead} bytes to the client.");
+                    byte[] buffer = new byte[8192];
+                    int bytesRead;
+
+                    while (!token.IsCancellationRequested && (bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, token)) > 0)
+                    {
+                        // Echo back the received message
+                        await stream.WriteAsync(buffer, 0, bytesRead, token);
+                        Console.WriteLine($"Echoed {bytesRead} bytes to the client.");
+                    }
+                }
+                catch (Exception ex) when (!(ex is OperationCanceledException))
+                {
+                    Console.WriteLine($"Error: {ex.Message}");
+                }
+                finally
+                {
+                    client.Close();
+                    Console.WriteLine("Client disconnected.");
                 }
-            }
-            catch (Exception ex) when (!(ex is OperationCanceledException))
-            {
-                Console.WriteLine($"Error: {ex.Message}");
-            }
-            finally
-            {
-                client.Close();
-                Console.WriteLine("Client disconnected.");
             }
         }
-    }
 
-    public void Stop()
-    {
-        _cancellationTokenSource.Cancel();
-        _listener.Stop();
-        _cancellationTokenSource.Dispose();
-        Console.WriteLine("Server stopped.");
-    }
-
-    public static async Task Main(string[] args)
-    {
-        EchoServer server = new EchoServer(5000);
+        public void Stop()
+        {
+            _cancellationTokenSource.Cancel();
+            _listener.Stop();
+            _cancellationTokenSource.Dispose();
+            Console.WriteLine("Server stopped.");
+        }
 
-        // Start the server in a separate task
-        _ = Task.Run(() => server.StartAsync());
+        public static async Task Main(string[] args)
+        {
+            EchoServer server = new EchoServer(5000);
 
-        string host = "127.0.0.1"; // Target IP
-        int port = 60000;          // Target Port
-        int intervalMilliseconds = 5000; // Send every 3 seconds
+            // Start the server in a separate task
+            _ = Task.Run(() => server.StartAsync());
 
-        using (var sender = new UdpTimedSender(host, port))
-        {
-            Console.WriteLine("Press any key to stop sending...");
-            sender.StartSending(intervalMilliseconds);
+            string host = "127.0.0.1"; // Target IP
+            int port = 60000;          // Target Port
+            int intervalMilliseconds = 5000; // Send every 3 seconds
 
-            Console.WriteLine("Press 'q' to quit...");
-            while (Console.ReadKey(intercept: true).Key != ConsoleKey.Q)
+            using (var sender = new UdpTimedSender(host, port))
             {
-                // Just wait until 'q' is pressed
-            }
+                Console.WriteLine("Press any key to stop sending...");
+                sender.StartSending(intervalMilliseconds);
 
-            sender.StopSending();
-            server.Stop();
-            Console.WriteLine("Sender stopped.");
+                Console.WriteLine("Press 'q' to quit...");
+                while (Console.ReadKey(intercept: true).Key != ConsoleKey.Q)
+                {
+                    // Just wait until 'q' is pressed
+                }
+
+                sender.StopSending();
+                server.Stop();
+                Console.WriteLine("Sender stopped.");
+            }
         }
     }
-}
 
 
-public class UdpTimedSender : IDisposable
-{
-    private readonly string _host;
-    private readonly int _port;
-    private readonly UdpClient _udpClient;
-    private Timer _timer;
-
-    public UdpTimedSender(string host, int port)
+    public class UdpTimedSender : IDisposable
     {
-        _host = host;
-        _port = port;
-        _udpClient = new UdpClient();
-    }
+        private readonly string _host;
+        private readonly int _port;
+        private readonly UdpClient _udpClient;
+        private Timer _timer;
 
-    public void StartSending(int intervalMilliseconds)
-    {
-        if (_timer != null)
-            throw new InvalidOperationException("Sender is already running.");
+        public UdpTimedSender(string host, int port)
+        {
+            _host = host;
+            _port = port;
+            _udpClient = new UdpClient();
+        }
 
-        _timer = new Timer(SendMessageCallback, null, 0, intervalMilliseconds);
-    }
+        public void StartSending(int intervalMilliseconds)
+        {
+            if (_timer != null)
+                throw new InvalidOperationException("Sender is already running.");
 
-    ushort i = 0;
+            _timer = new Timer(SendMessageCallback, null, 0, intervalMilliseconds);
+        }
 
-    private void SendMessageCallback(object state)
-    {
-        try
+        ushort i = 0;
+
+        private void SendMessageCallback(object state)
         {
-            //dummy data
-            Random rnd = new Random();
-            byte[] samples = new byte[1024];
-            rnd.NextBytes(samples);
-            i++;
+            try
+            {
+                //dummy data
+                Random rnd = new Random();
+                byte[] samples = new byte[1024];
+                rnd.NextBytes(samples);
+                i++;
 
-            byte[] msg = (new byte[] { 0x04, 0x84 }).Concat(BitConverter.GetBytes(i)).Concat(samples).ToArray();
-            var endpoint = new IPEndPoint(IPAddress.Parse(_host), _port);
+                byte[] msg = (new byte[] { 0x04, 0x84 }).Concat(BitConverter.GetBytes(i)).Concat(samples).ToArray();
+                var endpoint = new IPEndPoint(IPAddress.Parse(_host), _port);
 
-            _udpClient.Send(msg, msg.Length, endpoint);
-            Console.WriteLine($"Message sent to {_host}:{_port} ");
+                _udpClient.Send(msg, msg.Length, endpoint);
+                Console.WriteLine($"Message sent to {_host}:{_port} ");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error sending message: {ex.Message}");
+            }
         }
-        catch (Exception ex)
+
+        public void StopSending()
         {
-            Console.WriteLine($"Error sending message: {ex.Message}");
+            _timer?.Dispose();
+            _timer = null;
         }
-    }
-
-    public void StopSending()
-    {
-        _timer?.Dispose();
-        _timer = null;
-    }
 
-    public void Dispose()
-    {
-        StopSending();
-        _udpClient.Dispose();
+        public void Dispose()
+        {
+            StopSending();
+            _udpClient.Dispose();
+        }
     }
 }
\ No newline at end of file