diff --git a/app/ac-acx/src/test/resources/disks/MERLIN8PRO1.DSK b/app/ac-acx/src/test/resources/disks/MERLIN8PRO1.DSK
deleted file mode 100644
index 4131b05..0000000
Binary files a/app/ac-acx/src/test/resources/disks/MERLIN8PRO1.DSK and /dev/null differ
diff --git a/app/ac-acx/src/test/resources/disks/UniDOS_3.3.dsk b/app/ac-acx/src/test/resources/disks/UniDOS_3.3.dsk
deleted file mode 100644
index 02e4acf..0000000
Binary files a/app/ac-acx/src/test/resources/disks/UniDOS_3.3.dsk and /dev/null differ
diff --git a/app/ac-cli/build.gradle b/app/cli-ac/build.gradle
similarity index 100%
rename from app/ac-cli/build.gradle
rename to app/cli-ac/build.gradle
diff --git a/app/ac-cli/src/main/java/com/webcodepro/applecommander/ui/AntTask.java b/app/cli-ac/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
similarity index 100%
rename from app/ac-cli/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
rename to app/cli-ac/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
diff --git a/app/ac-cli/src/main/java/com/webcodepro/applecommander/ui/ac.java b/app/cli-ac/src/main/java/com/webcodepro/applecommander/ui/ac.java
similarity index 100%
rename from app/ac-cli/src/main/java/com/webcodepro/applecommander/ui/ac.java
rename to app/cli-ac/src/main/java/com/webcodepro/applecommander/ui/ac.java
diff --git a/app/ac-cli/src/test/java/com/webcodepro/applecommander/util/AppleSingleTest.java b/app/cli-ac/src/test/java/com/webcodepro/applecommander/util/AppleSingleTest.java
similarity index 100%
rename from app/ac-cli/src/test/java/com/webcodepro/applecommander/util/AppleSingleTest.java
rename to app/cli-ac/src/test/java/com/webcodepro/applecommander/util/AppleSingleTest.java
diff --git a/app/ac-cli/src/test/resources/hello.applesingle.bin b/app/cli-ac/src/test/resources/hello.applesingle.bin
similarity index 100%
rename from app/ac-cli/src/test/resources/hello.applesingle.bin
rename to app/cli-ac/src/test/resources/hello.applesingle.bin
diff --git a/app/ac-acx/README.md b/app/cli-acx/README.md
similarity index 100%
rename from app/ac-acx/README.md
rename to app/cli-acx/README.md
diff --git a/app/ac-acx/build.gradle b/app/cli-acx/build.gradle
similarity index 100%
rename from app/ac-acx/build.gradle
rename to app/cli-acx/build.gradle
diff --git a/app/ac-acx/gradle/wrapper/gradle-wrapper.jar b/app/cli-acx/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from app/ac-acx/gradle/wrapper/gradle-wrapper.jar
rename to app/cli-acx/gradle/wrapper/gradle-wrapper.jar
diff --git a/app/ac-acx/gradle/wrapper/gradle-wrapper.properties b/app/cli-acx/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from app/ac-acx/gradle/wrapper/gradle-wrapper.properties
rename to app/cli-acx/gradle/wrapper/gradle-wrapper.properties
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/Main.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/Main.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/Main.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/Main.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/PrintExceptionMessageHandler.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/PrintExceptionMessageHandler.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/PrintExceptionMessageHandler.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/PrintExceptionMessageHandler.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/SystemType.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/SystemType.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/SystemType.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/SystemType.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/VersionProvider.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/VersionProvider.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/VersionProvider.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/VersionProvider.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReadOnlyDiskImageCommandOptions.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReadOnlyDiskImageCommandOptions.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReadOnlyDiskImageCommandOptions.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReadOnlyDiskImageCommandOptions.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandOptions.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandOptions.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandOptions.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandOptions.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandWithGlobOptions.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandWithGlobOptions.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandWithGlobOptions.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReadWriteDiskCommandWithGlobOptions.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReusableCommandOptions.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReusableCommandOptions.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/base/ReusableCommandOptions.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/base/ReusableCommandOptions.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/ConvertCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ConvertCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/ConvertCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/ConvertCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/CopyFileCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/CopyFileCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/CopyFileCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/CopyFileCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/CreateDiskCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/CreateDiskCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/CreateDiskCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/CreateDiskCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/DeleteCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/DeleteCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/DeleteCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/DeleteCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/DiskMapCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/DiskMapCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/DiskMapCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/DiskMapCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/ExportCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ExportCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/ExportCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/ExportCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/ImportCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/InfoCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/InfoCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/InfoCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/InfoCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/ListCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/ListCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/ListCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/ListCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/LockCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/LockCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/LockCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/LockCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/MkdirCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/MkdirCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/MkdirCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/MkdirCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/RenameDiskCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RenameDiskCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/RenameDiskCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/RenameDiskCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/RenameFileCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RenameFileCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/RenameFileCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/RenameFileCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/RmdirCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/command/UnlockCommand.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/command/UnlockCommand.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/command/UnlockCommand.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/command/UnlockCommand.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/converter/DataSizeConverter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/converter/DataSizeConverter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/converter/DataSizeConverter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/converter/DataSizeConverter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/converter/DiskConverter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/converter/DiskConverter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/converter/DiskConverter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/converter/DiskConverter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/converter/IntegerTypeConverter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/converter/IntegerTypeConverter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/converter/IntegerTypeConverter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/converter/IntegerTypeConverter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/converter/SystemTypeConverter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/converter/SystemTypeConverter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/converter/SystemTypeConverter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/converter/SystemTypeConverter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/DosFileEntryReaderWriter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/DosFileEntryReaderWriter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/DosFileEntryReaderWriter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/DosFileEntryReaderWriter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryReader.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryReader.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryReader.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryReader.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryWriter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryWriter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryWriter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileEntryWriter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/FileUtils.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/NakedosFileEntryReader.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/NakedosFileEntryReader.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/NakedosFileEntryReader.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/NakedosFileEntryReader.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/OverrideFileEntryReader.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/OverrideFileEntryReader.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/OverrideFileEntryReader.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/OverrideFileEntryReader.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/PascalFileEntryReaderWriter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/PascalFileEntryReaderWriter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/PascalFileEntryReaderWriter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/PascalFileEntryReaderWriter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/ProdosFileEntryReaderWriter.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/ProdosFileEntryReaderWriter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/ProdosFileEntryReaderWriter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/ProdosFileEntryReaderWriter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/RdosFileEntryReader.java b/app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/RdosFileEntryReader.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/acx/fileutil/RdosFileEntryReader.java
rename to app/cli-acx/src/main/java/io/github/applecommander/acx/fileutil/RdosFileEntryReader.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/filestreamer/FileStreamer.java b/app/cli-acx/src/main/java/io/github/applecommander/filestreamer/FileStreamer.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/filestreamer/FileStreamer.java
rename to app/cli-acx/src/main/java/io/github/applecommander/filestreamer/FileStreamer.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/filestreamer/FileTuple.java b/app/cli-acx/src/main/java/io/github/applecommander/filestreamer/FileTuple.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/filestreamer/FileTuple.java
rename to app/cli-acx/src/main/java/io/github/applecommander/filestreamer/FileTuple.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/filestreamer/TypeOfFile.java b/app/cli-acx/src/main/java/io/github/applecommander/filestreamer/TypeOfFile.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/filestreamer/TypeOfFile.java
rename to app/cli-acx/src/main/java/io/github/applecommander/filestreamer/TypeOfFile.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/filters/AppleSingleFileFilter.java b/app/cli-acx/src/main/java/io/github/applecommander/filters/AppleSingleFileFilter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/filters/AppleSingleFileFilter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/filters/AppleSingleFileFilter.java
diff --git a/app/ac-acx/src/main/java/io/github/applecommander/filters/RawFileFilter.java b/app/cli-acx/src/main/java/io/github/applecommander/filters/RawFileFilter.java
similarity index 100%
rename from app/ac-acx/src/main/java/io/github/applecommander/filters/RawFileFilter.java
rename to app/cli-acx/src/main/java/io/github/applecommander/filters/RawFileFilter.java
diff --git a/app/ac-acx/src/test/java/io/github/applecommander/acx/converter/DataSizeConverterTest.java b/app/cli-acx/src/test/java/io/github/applecommander/acx/converter/DataSizeConverterTest.java
similarity index 100%
rename from app/ac-acx/src/test/java/io/github/applecommander/acx/converter/DataSizeConverterTest.java
rename to app/cli-acx/src/test/java/io/github/applecommander/acx/converter/DataSizeConverterTest.java
diff --git a/app/ac-acx/src/test/java/io/github/applecommander/filestreamer/FileStreamerTest.java b/app/cli-acx/src/test/java/io/github/applecommander/filestreamer/FileStreamerTest.java
similarity index 100%
rename from app/ac-acx/src/test/java/io/github/applecommander/filestreamer/FileStreamerTest.java
rename to app/cli-acx/src/test/java/io/github/applecommander/filestreamer/FileStreamerTest.java
diff --git a/app/ac-acx/src/test/java/io/github/applecommander/filestreamer/FileTupleTest.java b/app/cli-acx/src/test/java/io/github/applecommander/filestreamer/FileTupleTest.java
similarity index 100%
rename from app/ac-acx/src/test/java/io/github/applecommander/filestreamer/FileTupleTest.java
rename to app/cli-acx/src/test/java/io/github/applecommander/filestreamer/FileTupleTest.java
diff --git a/app/ac-swing/build.gradle b/app/gui-swing/build.gradle
similarity index 100%
rename from app/ac-swing/build.gradle
rename to app/gui-swing/build.gradle
diff --git a/app/ac-swing/src/main/java/com/webcodepro/applecommander/ui/swing/DiskExplorer.java b/app/gui-swing/src/main/java/com/webcodepro/applecommander/ui/swing/DiskExplorer.java
similarity index 100%
rename from app/ac-swing/src/main/java/com/webcodepro/applecommander/ui/swing/DiskExplorer.java
rename to app/gui-swing/src/main/java/com/webcodepro/applecommander/ui/swing/DiskExplorer.java
diff --git a/app/ac-swing/src/main/java/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java b/app/gui-swing/src/main/java/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java
similarity index 100%
rename from app/ac-swing/src/main/java/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java
rename to app/gui-swing/src/main/java/com/webcodepro/applecommander/ui/swing/EmulatorFileFilter.java
diff --git a/app/ac-swing/src/main/java/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java b/app/gui-swing/src/main/java/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java
similarity index 100%
rename from app/ac-swing/src/main/java/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java
rename to app/gui-swing/src/main/java/com/webcodepro/applecommander/ui/swing/SwingAppleCommander.java
diff --git a/app/ac-swt-linux-aarch64/build.gradle b/app/gui-swt-linux-aarch64/build.gradle
similarity index 100%
rename from app/ac-swt-linux-aarch64/build.gradle
rename to app/gui-swt-linux-aarch64/build.gradle
diff --git a/app/ac-swt-linux-x86_64/build.gradle b/app/gui-swt-linux-x86_64/build.gradle
similarity index 100%
rename from app/ac-swt-linux-x86_64/build.gradle
rename to app/gui-swt-linux-x86_64/build.gradle
diff --git a/app/ac-swt-macosx-aarch64/build.gradle b/app/gui-swt-macosx-aarch64/build.gradle
similarity index 100%
rename from app/ac-swt-macosx-aarch64/build.gradle
rename to app/gui-swt-macosx-aarch64/build.gradle
diff --git a/app/ac-swt-macosx-x86_64/build.gradle b/app/gui-swt-macosx-x86_64/build.gradle
similarity index 100%
rename from app/ac-swt-macosx-x86_64/build.gradle
rename to app/gui-swt-macosx-x86_64/build.gradle
diff --git a/app/ac-swt-win32-x86_64/build.gradle b/app/gui-swt-win32-x86_64/build.gradle
similarity index 100%
rename from app/ac-swt-win32-x86_64/build.gradle
rename to app/gui-swt-win32-x86_64/build.gradle
diff --git a/settings.gradle b/settings.gradle
index 8dad550..ab74a5a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,11 +2,11 @@ rootProject.name = "AppleCommander"
 
 include ':lib:ac-api'
 include ':lib:ac-swt-common'
-include ':app:ac-acx'
-include ':app:ac-cli'
-include ':app:ac-swing'
-include ':app:ac-swt-macosx-aarch64'
-include ':app:ac-swt-macosx-x86_64'
-include ':app:ac-swt-linux-aarch64'
-include ':app:ac-swt-linux-x86_64'
-include ':app:ac-swt-win32-x86_64'
+include ':app:cli-ac'
+include ':app:cli-acx'
+include ':app:gui-swing'
+include ':app:gui-swt-macosx-aarch64'
+include ':app:gui-swt-macosx-x86_64'
+include ':app:gui-swt-linux-aarch64'
+include ':app:gui-swt-linux-x86_64'
+include ':app:gui-swt-win32-x86_64'