diff --git a/Resources/Platforms/unix/QtSwissArmyKnife/share/applications/QtSwissArmyKnife.desktop b/Resources/Platforms/unix/QtSwissArmyKnife/share/applications/xTools.desktop
similarity index 100%
rename from Resources/Platforms/unix/QtSwissArmyKnife/share/applications/QtSwissArmyKnife.desktop
rename to Resources/Platforms/unix/QtSwissArmyKnife/share/applications/xTools.desktop
diff --git a/Resources/Platforms/unix/QtSwissArmyKnife/share/icons/hicolor/64x64/QtSwissArmyKnife.png b/Resources/Platforms/unix/QtSwissArmyKnife/share/icons/hicolor/64x64/xTools.png
similarity index 100%
rename from Resources/Platforms/unix/QtSwissArmyKnife/share/icons/hicolor/64x64/QtSwissArmyKnife.png
rename to Resources/Platforms/unix/QtSwissArmyKnife/share/icons/hicolor/64x64/xTools.png
diff --git a/Source/Assistants/ASCII/main.cpp b/Source/Assistants/ASCII/Source/main.cpp
similarity index 100%
rename from Source/Assistants/ASCII/main.cpp
rename to Source/Assistants/ASCII/Source/main.cpp
diff --git a/Source/Assistants/Base64/main.cpp b/Source/Assistants/Base64/Source/main.cpp
similarity index 100%
rename from Source/Assistants/Base64/main.cpp
rename to Source/Assistants/Base64/Source/main.cpp
diff --git a/Source/Assistants/Broadcast/main.cpp b/Source/Assistants/Broadcast/Source/main.cpp
similarity index 100%
rename from Source/Assistants/Broadcast/main.cpp
rename to Source/Assistants/Broadcast/Source/main.cpp
diff --git a/Source/Assistants/CRC/main.cpp b/Source/Assistants/CRC/Source/main.cpp
similarity index 100%
rename from Source/Assistants/CRC/main.cpp
rename to Source/Assistants/CRC/Source/main.cpp
diff --git a/Source/Assistants/FileCheck/main.cpp b/Source/Assistants/FileCheck/Source/main.cpp
similarity index 100%
rename from Source/Assistants/FileCheck/main.cpp
rename to Source/Assistants/FileCheck/Source/main.cpp
diff --git a/Source/Assistants/FileMerge/main.cpp b/Source/Assistants/FileMerge/Source/main.cpp
similarity index 100%
rename from Source/Assistants/FileMerge/main.cpp
rename to Source/Assistants/FileMerge/Source/main.cpp
diff --git a/Source/Assistants/Number/main.cpp b/Source/Assistants/Number/Source/main.cpp
similarity index 100%
rename from Source/Assistants/Number/main.cpp
rename to Source/Assistants/Number/Source/main.cpp
diff --git a/Source/Assistants/Ping/main.cpp b/Source/Assistants/Ping/Source/main.cpp
similarity index 100%
rename from Source/Assistants/Ping/main.cpp
rename to Source/Assistants/Ping/Source/main.cpp
diff --git a/Source/Assistants/QRCode/main.cpp b/Source/Assistants/QRCode/Source/main.cpp
similarity index 100%
rename from Source/Assistants/QRCode/main.cpp
rename to Source/Assistants/QRCode/Source/main.cpp
diff --git a/Source/Assistants/String/main.cpp b/Source/Assistants/String/Source/main.cpp
similarity index 100%
rename from Source/Assistants/String/main.cpp
rename to Source/Assistants/String/Source/main.cpp
diff --git a/Source/Assistants/mDNS/main.cpp b/Source/Assistants/mDNS/Source/main.cpp
similarity index 100%
rename from Source/Assistants/mDNS/main.cpp
rename to Source/Assistants/mDNS/Source/main.cpp