diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f874798
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+windows/win32s/Debug
+windows/win32s/libs/IRCParser/Debug
diff --git a/windows/win32s/StdAfx.cpp b/windows/win32s/StdAfx.cpp
index 47d2e0d..0489703 100644
--- a/windows/win32s/StdAfx.cpp
+++ b/windows/win32s/StdAfx.cpp
@@ -2,5 +2,22 @@
 //	Tinelix IRC.pch will be the pre-compiled header
 //	stdafx.obj will contain the pre-compiled type information
 
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
+//  
+//	This file is part of Tinelix IRC Client.
+//
+//  Tinelix IRC Client is free software: you can redistribute it and/or modify it under 
+//  the terms of the GNU General Public License as published by the Free Software Foundation, 
+//  either version 3 of the License, or (at your option) any later version.
+//  Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY 
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+//  PARTICULAR PURPOSE.
+//  See the GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License along with this
+//  program. If not, see https://www.gnu.org/licenses/.
+//
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
+
 #include "stdafx.h"
 
diff --git a/windows/win32s/Tinelix IRC.aps b/windows/win32s/Tinelix IRC.aps
index 522c6a7..5f4e391 100644
Binary files a/windows/win32s/Tinelix IRC.aps and b/windows/win32s/Tinelix IRC.aps differ
diff --git a/windows/win32s/Tinelix IRC.clw b/windows/win32s/Tinelix IRC.clw
index 0881c16..78dcb64 100644
--- a/windows/win32s/Tinelix IRC.clw	
+++ b/windows/win32s/Tinelix IRC.clw	
@@ -84,7 +84,7 @@ Control3=IDC_STATIC,static,1342308352
 Control4=IDOK,button,1342373889
 Control5=IDC_LICENSE,static,1342308352
 Control6=IDC_LICENSE2,static,1342308352
-Control7=IDC_SRC_CODE_ADDR,edit,1350633600
+Control7=IDC_SRC_CODE_ADDR,edit,1350633476
 Control8=IDC_SRC_CODE,static,1342308352
 
 [DLG:IDD_TABCHAT]
diff --git a/windows/win32s/Tinelix IRC.cpp b/windows/win32s/Tinelix IRC.cpp
index 689d45c..173eaf2 100644
--- a/windows/win32s/Tinelix IRC.cpp	
+++ b/windows/win32s/Tinelix IRC.cpp	
@@ -54,7 +54,24 @@ CIRCApplication::CIRCApplication()
 CIRCApplication theApp;
 
 /////////////////////////////////////////////////////////////////////////////
-// CIRCApplication initialization
+//  CIRCApplication initialization
+//
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
+//  
+//	This file is part of Tinelix IRC Client.
+//
+//  Tinelix IRC Client is free software: you can redistribute it and/or modify it under 
+//  the terms of the GNU General Public License as published by the Free Software Foundation, 
+//  either version 3 of the License, or (at your option) any later version.
+//  Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY 
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+//  PARTICULAR PURPOSE.
+//  See the GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License along with this
+//  program. If not, see https://www.gnu.org/licenses/.
+//
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 BOOL CIRCApplication::InitInstance()
 {
@@ -72,6 +89,33 @@ BOOL CIRCApplication::InitInstance()
 	int nResponse = 0;
 	CMainDlg dlg;
 	m_pMainWnd = &dlg;
+
+	char app_path[640];
+	sprintf(app_path, GetAppPath());
+
+	// Loading WSAWrapper library. 
+	// Available in https://github.com/tinelix/WSAWrapper (LGPLv2.1+)
+	char wsawrap_path[640];
+	sprintf(wsawrap_path, "%s\\wsawrap.dll", app_path);
+	char ircpars_path[640];
+	sprintf(ircpars_path, "%s\\ircpars.dll", app_path);
+
+	wsaWrap = LoadLibrary(wsawrap_path);
+	parser = LoadLibrary(ircpars_path);
+
+	if(!wsaWrap) {
+		MessageBox(NULL, "wsawrap.dll loading error", "Error", MB_OK|MB_ICONSTOP);
+		return FALSE;
+	}
+
+	if(!parser) {
+		MessageBox(NULL, "ircpars.dll loading error", "Error", MB_OK|MB_ICONSTOP);
+		return FALSE;
+	}
+
+	dlg.ImportDllFunctions(wsaWrap, parser);
+
+
 	nResponse = dlg.DoModal();
 
 	if (nResponse == IDOK)
diff --git a/windows/win32s/Tinelix IRC.h b/windows/win32s/Tinelix IRC.h
index 66ee78b..5c6eea4 100644
--- a/windows/win32s/Tinelix IRC.h	
+++ b/windows/win32s/Tinelix IRC.h	
@@ -1,6 +1,6 @@
 //  Tinelix IRC.h : main header file for the Tinelix IRC application
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #ifndef __AFXWIN_H__
 	#error include 'stdafx.h' before including this file for PCH
@@ -34,6 +34,8 @@ class CIRCApplication : public CWinApp
 	CIRCApplication();
 	BOOL CheckIsWin32s();
 	char* GetAppPath();
+	HINSTANCE wsaWrap;
+	HINSTANCE parser;
 
 // Overrides
 	// ClassWizard generated virtual function overrides
diff --git a/windows/win32s/Tinelix IRC.mak b/windows/win32s/Tinelix IRC.mak
index fccdf6a..719ebed 100644
--- a/windows/win32s/Tinelix IRC.mak	
+++ b/windows/win32s/Tinelix IRC.mak	
@@ -32,9 +32,9 @@ NULL=nul
 ################################################################################
 # Begin Project
 # PROP Target_Last_Scanned "Tinelix IRC - Win32 Debug"
+MTL=mktyplib.exe
 CPP=cl.exe
 RSC=rc.exe
-MTL=mktyplib.exe
 
 !IF  "$(CFG)" == "Tinelix IRC - Win32 Release"
 
@@ -55,16 +55,16 @@ ALL : "$(OUTDIR)\tlx_irc.exe"
 
 CLEAN : 
 	-@erase ".\Release\tlx_irc.exe"
-	-@erase ".\Release\ConnManDlg.obj"
+	-@erase ".\Release\MainDlg.obj"
 	-@erase ".\Release\Tinelix IRC.pch"
-	-@erase ".\Release\Tinelix IRC.obj"
-	-@erase ".\Release\TextBoxDlg.obj"
 	-@erase ".\Release\ProgressDlg.obj"
-	-@erase ".\Release\AboutDlg.obj"
-	-@erase ".\Release\AppThreadTab.obj"
 	-@erase ".\Release\StatisticsDlg.obj"
+	-@erase ".\Release\ConnManDlg.obj"
 	-@erase ".\Release\StdAfx.obj"
-	-@erase ".\Release\MainDlg.obj"
+	-@erase ".\Release\Tinelix IRC.obj"
+	-@erase ".\Release\TextBoxDlg.obj"
+	-@erase ".\Release\AppThreadTab.obj"
+	-@erase ".\Release\AboutDlg.obj"
 	-@erase ".\Release\Tinelix IRC.res"
 
 "$(OUTDIR)" :
@@ -94,15 +94,15 @@ LINK32=link.exe
 LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
  /pdb:"$(OUTDIR)/tlx_irc.pdb" /machine:I386 /out:"$(OUTDIR)/tlx_irc.exe" 
 LINK32_OBJS= \
+	"$(INTDIR)/MainDlg.obj" \
+	"$(INTDIR)/ProgressDlg.obj" \
+	"$(INTDIR)/StatisticsDlg.obj" \
 	"$(INTDIR)/ConnManDlg.obj" \
+	"$(INTDIR)/StdAfx.obj" \
 	"$(INTDIR)/Tinelix IRC.obj" \
 	"$(INTDIR)/TextBoxDlg.obj" \
-	"$(INTDIR)/ProgressDlg.obj" \
-	"$(INTDIR)/AboutDlg.obj" \
 	"$(INTDIR)/AppThreadTab.obj" \
-	"$(INTDIR)/StatisticsDlg.obj" \
-	"$(INTDIR)/StdAfx.obj" \
-	"$(INTDIR)/MainDlg.obj" \
+	"$(INTDIR)/AboutDlg.obj" \
 	"$(INTDIR)/Tinelix IRC.res"
 
 "$(OUTDIR)\tlx_irc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -132,15 +132,15 @@ CLEAN :
 	-@erase ".\Debug\Tinelix IRC.pch"
 	-@erase ".\Debug\vc40.idb"
 	-@erase ".\Debug\tlx_irc.exe"
+	-@erase ".\Debug\AboutDlg.obj"
+	-@erase ".\Debug\MainDlg.obj"
+	-@erase ".\Debug\StdAfx.obj"
+	-@erase ".\Debug\ProgressDlg.obj"
 	-@erase ".\Debug\Tinelix IRC.obj"
+	-@erase ".\Debug\StatisticsDlg.obj"
 	-@erase ".\Debug\TextBoxDlg.obj"
-	-@erase ".\Debug\AboutDlg.obj"
 	-@erase ".\Debug\AppThreadTab.obj"
-	-@erase ".\Debug\ProgressDlg.obj"
 	-@erase ".\Debug\ConnManDlg.obj"
-	-@erase ".\Debug\MainDlg.obj"
-	-@erase ".\Debug\StatisticsDlg.obj"
-	-@erase ".\Debug\StdAfx.obj"
 	-@erase ".\Debug\Tinelix IRC.res"
 	-@erase ".\Debug\tlx_irc.ilk"
 	-@erase ".\Debug\tlx_irc.pdb"
@@ -173,15 +173,15 @@ LINK32=link.exe
 LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
  /pdb:"$(OUTDIR)/tlx_irc.pdb" /debug /machine:I386 /out:"$(OUTDIR)/tlx_irc.exe" 
 LINK32_OBJS= \
+	"$(INTDIR)/AboutDlg.obj" \
+	"$(INTDIR)/MainDlg.obj" \
+	"$(INTDIR)/StdAfx.obj" \
+	"$(INTDIR)/ProgressDlg.obj" \
 	"$(INTDIR)/Tinelix IRC.obj" \
+	"$(INTDIR)/StatisticsDlg.obj" \
 	"$(INTDIR)/TextBoxDlg.obj" \
-	"$(INTDIR)/AboutDlg.obj" \
 	"$(INTDIR)/AppThreadTab.obj" \
-	"$(INTDIR)/ProgressDlg.obj" \
 	"$(INTDIR)/ConnManDlg.obj" \
-	"$(INTDIR)/MainDlg.obj" \
-	"$(INTDIR)/StatisticsDlg.obj" \
-	"$(INTDIR)/StdAfx.obj" \
 	"$(INTDIR)/Tinelix IRC.res"
 
 "$(OUTDIR)\tlx_irc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
diff --git a/windows/win32s/Tinelix IRC.mdp b/windows/win32s/Tinelix IRC.mdp
index 5ef59cf..980950b 100644
Binary files a/windows/win32s/Tinelix IRC.mdp and b/windows/win32s/Tinelix IRC.mdp differ
diff --git a/windows/win32s/Tinelix IRC.ncb b/windows/win32s/Tinelix IRC.ncb
index 86328c9..e7c1abf 100644
Binary files a/windows/win32s/Tinelix IRC.ncb and b/windows/win32s/Tinelix IRC.ncb differ
diff --git a/windows/win32s/Tinelix IRC.rc b/windows/win32s/Tinelix IRC.rc
index 2e24f46..2072dba 100644
--- a/windows/win32s/Tinelix IRC.rc	
+++ b/windows/win32s/Tinelix IRC.rc	
@@ -84,22 +84,22 @@ END
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 241, 156
+IDD_ABOUTBOX DIALOGEX 0, 0, 241, 159
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Tinelix IRC"
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDR_APPICON,IDC_STATIC,5,6,21,20
-    LTEXT           "Tinelix IRC Client 0.2.0-b002 for Win32s",IDC_STATIC,35,
+    LTEXT           "Tinelix IRC Client 0.2.0-b003 for Win32s",IDC_STATIC,35,
                     6,156,8,SS_NOPREFIX
-    LTEXT           "Copyright © 2023 Dmitry Tretyakov (Tinelix)",IDC_STATIC,
-                    35,17,170,10
-    DEFPUSHBUTTON   "OK",IDOK,190,137,46,14,WS_GROUP
+    LTEXT           "Copyright © 2023, 2024 Dmitry Tretyakov (Tinelix)",
+                    IDC_STATIC,35,17,170,10
+    DEFPUSHBUTTON   "OK",IDOK,190,140,46,14,WS_GROUP
     LTEXT           "This is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.",
                     IDC_LICENSE,35,36,201,36
     LTEXT           "Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.",
                     IDC_LICENSE2,35,74,201,36
-    EDITTEXT        IDC_SRC_CODE_ADDR,93,115,137,12,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_SRC_CODE_ADDR,93,115,143,21,ES_MULTILINE | 
                     ES_READONLY,WS_EX_TRANSPARENT
     LTEXT           "Source code:",IDC_SRC_CODE,35,117,53,10
 END
@@ -214,7 +214,7 @@ BEGIN
         LEFTMARGIN, 5
         RIGHTMARGIN, 236
         TOPMARGIN, 6
-        BOTTOMMARGIN, 151
+        BOTTOMMARGIN, 154
     END
 
     IDD_TABTHREAD, DIALOG
@@ -295,8 +295,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,2,0,2
- PRODUCTVERSION 0,2,0,2
+ FILEVERSION 0,2,0,3
+ PRODUCTVERSION 0,2,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x23L
@@ -314,13 +314,13 @@ BEGIN
             VALUE "Comments", "Tinelix IRC Client compatible version with Win32s, Windows 95/98, Windows NT and 64-bit (AMD64) Windows editions.\0"
             VALUE "CompanyName", "Tinelix\0"
             VALUE "FileDescription", "Tinelix IRC\0"
-            VALUE "FileVersion", "0.2.0-b002\0"
+            VALUE "FileVersion", "0.2.0-b003\0"
             VALUE "InternalName", "Tinelix IRC for Win32s\0"
             VALUE "LegalCopyright", "Copyright © 2023 Dmitry Tretyakov (aka. tretdm). Licensed under GPLv3.\0"
             VALUE "OriginalFilename", "tlx_irc.exe\0"
             VALUE "ProductName", "Tinelix IRC for Win32s\0"
-            VALUE "ProductVersion", "0.2.0-b002\0"
-            VALUE "SpecialBuild", "Source code: https://github.com/tinelix/irc-client-win32s\0"
+            VALUE "ProductVersion", "0.2.0-b003\0"
+            VALUE "SpecialBuild", "Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/windows/win32s/dialogs/AboutDlg.cpp b/windows/win32s/dialogs/AboutDlg.cpp
index c64c6b2..38f708c 100644
--- a/windows/win32s/dialogs/AboutDlg.cpp
+++ b/windows/win32s/dialogs/AboutDlg.cpp
@@ -1,6 +1,6 @@
 //  AboutDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 
 #include "stdafx.h"
@@ -72,7 +72,7 @@ BOOL CAboutDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
 	
-	src_code_repo = CString("https://github.com/tinelix/irc-client-win32s");
+	src_code_repo = CString("https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s");
 	CEdit* source_code_addr = (CEdit*)GetDlgItem(IDC_SRC_CODE_ADDR);
 	source_code_addr->SetWindowText(src_code_repo);
 	
diff --git a/windows/win32s/dialogs/AboutDlg.h b/windows/win32s/dialogs/AboutDlg.h
index 116cd7b..3b96af2 100644
--- a/windows/win32s/dialogs/AboutDlg.h
+++ b/windows/win32s/dialogs/AboutDlg.h
@@ -1,6 +1,6 @@
 //  AboutDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CAboutDlg dialog
diff --git a/windows/win32s/dialogs/ConnManDlg.cpp b/windows/win32s/dialogs/ConnManDlg.cpp
index be8a4bf..9356ccf 100644
--- a/windows/win32s/dialogs/ConnManDlg.cpp
+++ b/windows/win32s/dialogs/ConnManDlg.cpp
@@ -1,6 +1,6 @@
 //  ConnManDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include "..\Tinelix IRC.h"
diff --git a/windows/win32s/dialogs/ConnManDlg.h b/windows/win32s/dialogs/ConnManDlg.h
index fd2d0f0..9ab1d48 100644
--- a/windows/win32s/dialogs/ConnManDlg.h
+++ b/windows/win32s/dialogs/ConnManDlg.h
@@ -1,6 +1,6 @@
 //  ConnManDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CConnManDlg dialog
diff --git a/windows/win32s/dialogs/MainDlg.cpp b/windows/win32s/dialogs/MainDlg.cpp
index f23078f..10d36da 100644
--- a/windows/win32s/dialogs/MainDlg.cpp
+++ b/windows/win32s/dialogs/MainDlg.cpp
@@ -1,6 +1,6 @@
 //  MainDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include <winsock.h>
@@ -130,32 +130,8 @@ BOOL CMainDlg::OnInitDialog()
 	ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
 	ASSERT(IDM_ABOUTBOX < 0xF000);
 
-	char app_path[640];
-	sprintf(app_path, app->GetAppPath());
-
-	// Loading WSAWrapper library. 
-	// Available in https://github.com/tinelix/WSAWrapper (LGPLv2.1+)
-	char wsawrap_path[640];
-	sprintf(wsawrap_path, "%s\\wsawrap.dll", app_path);
-	char ircpars_path[640];
-	sprintf(ircpars_path, "%s\\ircpars.dll", app_path);
-	wsaWrap = LoadLibrary(wsawrap_path);
 	conn_server = "";
 
-	if(!wsaWrap) {
-		MessageBox("wsawrap.dll loading error", "Error", MB_OK|MB_ICONSTOP);
-		EnableWindow(FALSE);
-		return FALSE;
-	}
-
-	ircParser = LoadLibrary(ircpars_path);
-	if(!ircParser) {
-		MessageBox("ircpars.dll loading error", "Error", MB_OK|MB_ICONSTOP);
-		EnableWindow(FALSE);
-		return FALSE;
-	}
-
-	ImportDllFunctions();
 	(EnableDebug)(TRUE);
 
 	CMenu* pSysMenu = GetSystemMenu(FALSE);
@@ -324,7 +300,10 @@ void CMainDlg::PrepareConnect(int result) {
 	}
 }
 
-void CMainDlg::ImportDllFunctions() {
+void CMainDlg::ImportDllFunctions(HINSTANCE _wsaWrap, HINSTANCE _ircParser) {
+	wsaWrap = _wsaWrap;
+	ircParser = _ircParser;
+
 	// Running EnableDebugging function (#14) in WSAWrapper DLL
 	EnableDebug = (EnableDebugging)GetProcAddress(wsaWrap, MAKEINTRESOURCE(14));
 	// Running EnableAsyncMessages function (#15) in WSAWrapper DLL
diff --git a/windows/win32s/dialogs/MainDlg.h b/windows/win32s/dialogs/MainDlg.h
index 6b757f4..8d5b00c 100644
--- a/windows/win32s/dialogs/MainDlg.h
+++ b/windows/win32s/dialogs/MainDlg.h
@@ -1,6 +1,6 @@
 //  MainDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CMainDlg dialog
@@ -32,6 +32,8 @@ class CMainDlg : public CDialog
 
 	CMainDlg(CWnd* pParent = NULL);	// standard constructor
 
+	void ImportDllFunctions(HINSTANCE _wsaWrap, HINSTANCE _ircParser);
+
 // Dialog Data
 	//{{AFX_DATA(CMainDlg)
 	enum { IDD = IDD_MAINDIALOG };
@@ -54,7 +56,6 @@ class CMainDlg : public CDialog
 	void CreateTabs();
 	void PrepareConnect(LPSTR address, int port);
 	void PrepareConnect(int result);
-	void ImportDllFunctions();
 	void IdentificateConnection();
 	void SendPing(CString ping_hexcode);
 	CString ParseMessage(char* irc_packet);
diff --git a/windows/win32s/dialogs/ProgressDlg.cpp b/windows/win32s/dialogs/ProgressDlg.cpp
index 8dde465..b036fce 100644
--- a/windows/win32s/dialogs/ProgressDlg.cpp
+++ b/windows/win32s/dialogs/ProgressDlg.cpp
@@ -1,6 +1,6 @@
-// ProgressDlg.cpp : implementation file
+//  ProgressDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include "..\Tinelix IRC.h"
diff --git a/windows/win32s/dialogs/ProgressDlg.h b/windows/win32s/dialogs/ProgressDlg.h
index a19950f..00e9349 100644
--- a/windows/win32s/dialogs/ProgressDlg.h
+++ b/windows/win32s/dialogs/ProgressDlg.h
@@ -1,6 +1,6 @@
 //  ProgressDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CProgressDlg dialog
diff --git a/windows/win32s/dialogs/StatisticsDlg.cpp b/windows/win32s/dialogs/StatisticsDlg.cpp
index 7e5cf07..8c4728c 100644
--- a/windows/win32s/dialogs/StatisticsDlg.cpp
+++ b/windows/win32s/dialogs/StatisticsDlg.cpp
@@ -1,6 +1,6 @@
-// StatisticsDlg.cpp : implementation file
+//  StatisticsDlg.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include "..\Tinelix IRC.h"
diff --git a/windows/win32s/dialogs/StatisticsDlg.h b/windows/win32s/dialogs/StatisticsDlg.h
index c6671a5..2616531 100644
--- a/windows/win32s/dialogs/StatisticsDlg.h
+++ b/windows/win32s/dialogs/StatisticsDlg.h
@@ -1,6 +1,6 @@
 //  StatisticsDlg.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CStatisticsDlg dialog
diff --git a/windows/win32s/dialogs/TextBoxDlg.cpp b/windows/win32s/dialogs/TextBoxDlg.cpp
index f065443..0842a58 100644
--- a/windows/win32s/dialogs/TextBoxDlg.cpp
+++ b/windows/win32s/dialogs/TextBoxDlg.cpp
@@ -1,5 +1,21 @@
-// TextBoxDlg.cpp : implementation file
+//  TextBoxDlg.cpp : implementation file
 //
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
+//  
+//	This file is part of Tinelix IRC Client.
+//
+//  Tinelix IRC Client is free software: you can redistribute it and/or modify it under 
+//  the terms of the GNU General Public License as published by the Free Software Foundation, 
+//  either version 3 of the License, or (at your option) any later version.
+//  Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY 
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+//  PARTICULAR PURPOSE.
+//  See the GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License along with this
+//  program. If not, see https://www.gnu.org/licenses/.
+//
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include "..\Tinelix IRC.h"
diff --git a/windows/win32s/dialogs/TextBoxDlg.h b/windows/win32s/dialogs/TextBoxDlg.h
index c57865f..d7713af 100644
--- a/windows/win32s/dialogs/TextBoxDlg.h
+++ b/windows/win32s/dialogs/TextBoxDlg.h
@@ -1,5 +1,21 @@
-// TextBoxDlg.h : header file
+//  TextBoxDlg.h : header file
 //
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
+//  
+//	This file is part of Tinelix IRC Client.
+//
+//  Tinelix IRC Client is free software: you can redistribute it and/or modify it under 
+//  the terms of the GNU General Public License as published by the Free Software Foundation, 
+//  either version 3 of the License, or (at your option) any later version.
+//  Tinelix IRC Client is distributed in the hope that it will be useful, but WITHOUT ANY 
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+//  PARTICULAR PURPOSE.
+//  See the GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License along with this
+//  program. If not, see https://www.gnu.org/licenses/.
+//
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CTextBoxDlg dialog
diff --git a/windows/win32s/libs/IRCParser/Tinelix IRC Parser.mdp b/windows/win32s/libs/IRCParser/Tinelix IRC Parser.mdp
index 6969602..0123230 100644
Binary files a/windows/win32s/libs/IRCParser/Tinelix IRC Parser.mdp and b/windows/win32s/libs/IRCParser/Tinelix IRC Parser.mdp differ
diff --git a/windows/win32s/libs/IRCParser/Tinelix IRC Parser.ncb b/windows/win32s/libs/IRCParser/Tinelix IRC Parser.ncb
index b7be383..8e1314d 100644
Binary files a/windows/win32s/libs/IRCParser/Tinelix IRC Parser.ncb and b/windows/win32s/libs/IRCParser/Tinelix IRC Parser.ncb differ
diff --git a/windows/win32s/tabs/AppThreadTab.cpp b/windows/win32s/tabs/AppThreadTab.cpp
index 68b0dae..3d1109d 100644
--- a/windows/win32s/tabs/AppThreadTab.cpp
+++ b/windows/win32s/tabs/AppThreadTab.cpp
@@ -1,6 +1,6 @@
 //  appthreadtab.cpp : implementation file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 #include "stdafx.h"
 #include "..\Tinelix IRC.h"
diff --git a/windows/win32s/tabs/AppThreadTab.h b/windows/win32s/tabs/AppThreadTab.h
index 3e2ede3..78357ff 100644
--- a/windows/win32s/tabs/AppThreadTab.h
+++ b/windows/win32s/tabs/AppThreadTab.h
@@ -1,6 +1,6 @@
 //  appthreadtab.h : header file
 //
-//  Copyright © 2023 Dmitry Tretyakov (aka. Tinelix)
+//  Copyright © 2023, 2024 Dmitry Tretyakov (aka. Tinelix)
 //  
 //	This file is part of Tinelix IRC Client.
 //
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU General Public License along with this
 //  program. If not, see https://www.gnu.org/licenses/.
 //
-//  Source code: https://github.com/tinelix/irc-client-win32s
+//  Source code: https://github.com/tinelix/irc-client-legacy/tree/main/windows/win32s
 
 /////////////////////////////////////////////////////////////////////////////
 // CAppThreadTab dialog