diff --git a/extras/ghidra-setup.iss b/extras/ghidra/ghidra-setup.iss
similarity index 100%
rename from extras/ghidra-setup.iss
rename to extras/ghidra/ghidra-setup.iss
diff --git a/extras/icon.ico b/extras/ghidra/icon.ico
similarity index 100%
rename from extras/icon.ico
rename to extras/ghidra/icon.ico
diff --git a/extras/oldies/icon.ico b/extras/oldies/icon.ico
new file mode 100644
index 0000000..ced7cd0
Binary files /dev/null and b/extras/oldies/icon.ico differ
diff --git a/toolkit/Analysis/PEiD/PEiD - 0.95.7z b/extras/oldies/toolkit/Analysis/PEiD/PEiD - 0.95.7z
similarity index 100%
rename from toolkit/Analysis/PEiD/PEiD - 0.95.7z
rename to extras/oldies/toolkit/Analysis/PEiD/PEiD - 0.95.7z
diff --git a/toolkit/Analysis/ProtectionID/ProtectionID - 0.6.9.0.7z b/extras/oldies/toolkit/Analysis/ProtectionID/ProtectionID - 0.6.9.0.7z
similarity index 100%
rename from toolkit/Analysis/ProtectionID/ProtectionID - 0.6.9.0.7z
rename to extras/oldies/toolkit/Analysis/ProtectionID/ProtectionID - 0.6.9.0.7z
diff --git a/toolkit/Decompilers/[DELPHI] Dede/Dede - 3.5.7z b/extras/oldies/toolkit/Decompilers/[DELPHI] Dede/Dede - 3.5.7z
similarity index 100%
rename from toolkit/Decompilers/[DELPHI] Dede/Dede - 3.5.7z
rename to extras/oldies/toolkit/Decompilers/[DELPHI] Dede/Dede - 3.5.7z
diff --git a/toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.83.7z b/extras/oldies/toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.83.7z
similarity index 100%
rename from toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.83.7z
rename to extras/oldies/toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.83.7z
diff --git a/toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.88.7z b/extras/oldies/toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.88.7z
similarity index 100%
rename from toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.88.7z
rename to extras/oldies/toolkit/Decompilers/[DOTNET] GrayWolf/GrayWolf - 1.88.7z
diff --git a/toolkit/Dissasembler/BDASM/BDASM - 2.5.7z b/extras/oldies/toolkit/Dissasembler/BDASM/BDASM - 2.5.7z
similarity index 100%
rename from toolkit/Dissasembler/BDASM/BDASM - 2.5.7z
rename to extras/oldies/toolkit/Dissasembler/BDASM/BDASM - 2.5.7z
diff --git a/toolkit/Dissasembler/OllyDbg 1.10/OllyDbg - 1.10.7z b/extras/oldies/toolkit/Dissasembler/OllyDbg 1.10/OllyDbg - 1.10.7z
similarity index 100%
rename from toolkit/Dissasembler/OllyDbg 1.10/OllyDbg - 1.10.7z
rename to extras/oldies/toolkit/Dissasembler/OllyDbg 1.10/OllyDbg - 1.10.7z
diff --git a/toolkit/Dissasembler/w32Dasm/[++] w32Dasm - 8.93.7z b/extras/oldies/toolkit/Dissasembler/w32Dasm/[++] w32Dasm - 8.93.7z
similarity index 100%
rename from toolkit/Dissasembler/w32Dasm/[++] w32Dasm - 8.93.7z
rename to extras/oldies/toolkit/Dissasembler/w32Dasm/[++] w32Dasm - 8.93.7z
diff --git a/toolkit/Dissasembler/w32Dasm/[10] w32Dasm - 8.93.7z b/extras/oldies/toolkit/Dissasembler/w32Dasm/[10] w32Dasm - 8.93.7z
similarity index 100%
rename from toolkit/Dissasembler/w32Dasm/[10] w32Dasm - 8.93.7z
rename to extras/oldies/toolkit/Dissasembler/w32Dasm/[10] w32Dasm - 8.93.7z
diff --git a/toolkit/Dissasembler/w32Dasm/[HiEndsoft] w32Dasm - 8.93.7z b/extras/oldies/toolkit/Dissasembler/w32Dasm/[HiEndsoft] w32Dasm - 8.93.7z
similarity index 100%
rename from toolkit/Dissasembler/w32Dasm/[HiEndsoft] w32Dasm - 8.93.7z
rename to extras/oldies/toolkit/Dissasembler/w32Dasm/[HiEndsoft] w32Dasm - 8.93.7z
diff --git a/toolkit/Dissasembler/w32Dasm/[bradpach] w32Dasm - 8.93.7z b/extras/oldies/toolkit/Dissasembler/w32Dasm/[bradpach] w32Dasm - 8.93.7z
similarity index 100%
rename from toolkit/Dissasembler/w32Dasm/[bradpach] w32Dasm - 8.93.7z
rename to extras/oldies/toolkit/Dissasembler/w32Dasm/[bradpach] w32Dasm - 8.93.7z
diff --git a/toolkit/Dissasembler/w32Dasm/[original] w32Dasm - 8.93.7z b/extras/oldies/toolkit/Dissasembler/w32Dasm/[original] w32Dasm - 8.93.7z
similarity index 100%
rename from toolkit/Dissasembler/w32Dasm/[original] w32Dasm - 8.93.7z
rename to extras/oldies/toolkit/Dissasembler/w32Dasm/[original] w32Dasm - 8.93.7z
diff --git a/toolkit/Other/AVFucker/AVFucker - 1.1.2.7z b/extras/oldies/toolkit/Other/AVFucker/AVFucker - 1.1.2.7z
similarity index 100%
rename from toolkit/Other/AVFucker/AVFucker - 1.1.2.7z
rename to extras/oldies/toolkit/Other/AVFucker/AVFucker - 1.1.2.7z
diff --git a/toolkit/Other/ImpREC/ImpREC - 1.7e.7z b/extras/oldies/toolkit/Other/ImpREC/ImpREC - 1.7e.7z
similarity index 100%
rename from toolkit/Other/ImpREC/ImpREC - 1.7e.7z
rename to extras/oldies/toolkit/Other/ImpREC/ImpREC - 1.7e.7z
diff --git a/toolkit/Other/ImpREC/ImpREC - 1.7f.7z b/extras/oldies/toolkit/Other/ImpREC/ImpREC - 1.7f.7z
similarity index 100%
rename from toolkit/Other/ImpREC/ImpREC - 1.7f.7z
rename to extras/oldies/toolkit/Other/ImpREC/ImpREC - 1.7f.7z
diff --git a/toolkit/Other/ShowString/ShowString - 2.0.7z b/extras/oldies/toolkit/Other/ShowString/ShowString - 2.0.7z
similarity index 100%
rename from toolkit/Other/ShowString/ShowString - 2.0.7z
rename to extras/oldies/toolkit/Other/ShowString/ShowString - 2.0.7z
diff --git a/toolkit/UnPacking/GUnPacker/GUnPacker - 0.5.7z b/extras/oldies/toolkit/UnPacking/GUnPacker/GUnPacker - 0.5.7z
similarity index 100%
rename from toolkit/UnPacking/GUnPacker/GUnPacker - 0.5.7z
rename to extras/oldies/toolkit/UnPacking/GUnPacker/GUnPacker - 0.5.7z
diff --git a/toolkit/UnPacking/NETUnpack/NETUnpack - 1.0.0.1.7z b/extras/oldies/toolkit/UnPacking/NETUnpack/NETUnpack - 1.0.0.1.7z
similarity index 100%
rename from toolkit/UnPacking/NETUnpack/NETUnpack - 1.0.0.1.7z
rename to extras/oldies/toolkit/UnPacking/NETUnpack/NETUnpack - 1.0.0.1.7z
diff --git a/toolkit/UnPacking/RL!dePacker/RL!dePacker - 1.5.7z b/extras/oldies/toolkit/UnPacking/RL!dePacker/RL!dePacker - 1.5.7z
similarity index 100%
rename from toolkit/UnPacking/RL!dePacker/RL!dePacker - 1.5.7z
rename to extras/oldies/toolkit/UnPacking/RL!dePacker/RL!dePacker - 1.5.7z
diff --git a/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.2.7z b/extras/oldies/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.2.7z
similarity index 100%
rename from toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.2.7z
rename to extras/oldies/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.2.7z
diff --git a/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.3.7z b/extras/oldies/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.3.7z
similarity index 100%
rename from toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.3.7z
rename to extras/oldies/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.3.7z
diff --git a/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.6.7z b/extras/oldies/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.6.7z
similarity index 100%
rename from toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.6.7z
rename to extras/oldies/toolkit/UnPacking/VMUnpacker/VMUnpacker - 1.6.7z