diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d43c596..72937128 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -293,7 +293,7 @@ jobs:
           set s=%H%\src
           cat .GITREV.txt
           set /p GITREV=<.GITREV.txt
-          set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\filter\*.cpp %s%\util\*.cpp
+          set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\console\*.cpp %s%\filter\*.cpp %s%\util\*.cpp
           cl -std:c++17 -Zc:__cplusplus -EHsc -J -O2 -W4 -WX -DUPX_VERSION_GITREV="""%GITREV%""" -DWITH_ZSTD %DEFS% -I%H%\vendor -I%H%\vendor\boost-pfr\include -Feupx.exe %sources% %BDIR%\ucl\ucl.lib %BDIR%\zlib\zlib.lib %BDIR%\zstd\zstd.lib /link setargv.obj
       - name: 'Make artifact'
         shell: bash
diff --git a/src/conf.h b/src/conf.h
index f005b807..6ae3d00b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -781,7 +781,7 @@ struct upx_compress_result_t
 #include "options.h"
 #include "except.h"
 #include "bele.h"
-#include "console.h"
+#include "console/console.h"
 #include "util/util.h"
 
 // classes
diff --git a/src/c_file.cpp b/src/console/c_file.cpp
similarity index 98%
rename from src/c_file.cpp
rename to src/console/c_file.cpp
index 0c84def4..cedb04dc 100644
--- a/src/c_file.cpp
+++ b/src/console/c_file.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_CONSOLE)
 
diff --git a/src/c_init.cpp b/src/console/c_init.cpp
similarity index 99%
rename from src/c_init.cpp
rename to src/console/c_init.cpp
index 58d9979d..93cb79aa 100644
--- a/src/c_init.cpp
+++ b/src/console/c_init.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 FILE *con_term = nullptr;
 
diff --git a/src/c_none.cpp b/src/console/c_none.cpp
similarity index 98%
rename from src/c_none.cpp
rename to src/console/c_none.cpp
index 1d746bd0..ef5f2edc 100644
--- a/src/c_none.cpp
+++ b/src/console/c_none.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_CONSOLE)
 
diff --git a/src/c_screen.cpp b/src/console/c_screen.cpp
similarity index 99%
rename from src/c_screen.cpp
rename to src/console/c_screen.cpp
index 77902fb1..3b39e207 100644
--- a/src/c_screen.cpp
+++ b/src/console/c_screen.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN)
 
diff --git a/src/console.h b/src/console/console.h
similarity index 99%
rename from src/console.h
rename to src/console/console.h
index e26a212d..1aa892b6 100644
--- a/src/console.h
+++ b/src/console/console.h
@@ -25,6 +25,8 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
+#pragma once
+
 /*************************************************************************
 //
 **************************************************************************/
diff --git a/src/s_djgpp2.cpp b/src/console/s_djgpp2.cpp
similarity index 99%
rename from src/s_djgpp2.cpp
rename to src/console/s_djgpp2.cpp
index 2cfd2a04..8e33158e 100644
--- a/src/s_djgpp2.cpp
+++ b/src/console/s_djgpp2.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN) && (ACC_OS_DOS32) && defined(__DJGPP__)
 #if (ACC_CC_GNUC >= 0x040300ul)
diff --git a/src/s_object.cpp b/src/console/s_object.cpp
similarity index 99%
rename from src/s_object.cpp
rename to src/console/s_object.cpp
index c967d8a0..d9b64a83 100644
--- a/src/s_object.cpp
+++ b/src/console/s_object.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN)
 
diff --git a/src/s_vcsa.cpp b/src/console/s_vcsa.cpp
similarity index 99%
rename from src/s_vcsa.cpp
rename to src/console/s_vcsa.cpp
index 325b3fe5..aa6ce5e3 100644
--- a/src/s_vcsa.cpp
+++ b/src/console/s_vcsa.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN) && (USE_SCREEN_VCSA)
 
diff --git a/src/s_win32.cpp b/src/console/s_win32.cpp
similarity index 99%
rename from src/s_win32.cpp
rename to src/console/s_win32.cpp
index 4802f2b6..5c910e87 100644
--- a/src/s_win32.cpp
+++ b/src/console/s_win32.cpp
@@ -25,7 +25,7 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#include "conf.h"
+#include "../conf.h"
 
 #if (USE_SCREEN_WIN32)
 
diff --git a/src/screen.h b/src/console/screen.h
similarity index 98%
rename from src/screen.h
rename to src/console/screen.h
index a55c02df..2d5b7e1f 100644
--- a/src/screen.h
+++ b/src/console/screen.h
@@ -25,8 +25,9 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-#ifndef __UPX_SCREEN_H
-#define __UPX_SCREEN_H 1
+#pragma once
+#ifndef UPX_SCREEN_H__
+#define UPX_SCREEN_H__ 1
 
 #if (USE_SCREEN)
 
diff --git a/src/ui.cpp b/src/ui.cpp
index cbe601ff..f74ef9fc 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -27,9 +27,9 @@
 
 #include "conf.h"
 #include "file.h"
-#include "ui.h"
-#include "screen.h"
 #include "packer.h"
+#include "ui.h"
+#include "console/screen.h"
 
 #if 1 && (USE_SCREEN)
 #define UI_USE_SCREEN 1
diff --git a/src/ui.h b/src/ui.h
index 4373b40a..5cb26352 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -26,13 +26,11 @@
  */
 
 #pragma once
-#ifndef __UPX_UI_H
-#define __UPX_UI_H 1
+#ifndef UPX_UI_H__
+#define UPX_UI_H__ 1
 
-class InputFile;
 class OutputFile;
 class Packer;
-class UiPacker;
 
 /*************************************************************************
 //