diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.md5 b/malwares/Binaries/Android.Skygofree/Android.Skygofree.md5
similarity index 100%
rename from malwares/Binaries/Android.Skygofree/SkyGoFree.md5
rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.md5
diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.pass b/malwares/Binaries/Android.Skygofree/Android.Skygofree.pass
similarity index 100%
rename from malwares/Binaries/Android.Skygofree/SkyGoFree.pass
rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.pass
diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.sha1 b/malwares/Binaries/Android.Skygofree/Android.Skygofree.sha1
similarity index 100%
rename from malwares/Binaries/Android.Skygofree/SkyGoFree.sha1
rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.sha1
diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.zip b/malwares/Binaries/Android.Skygofree/Android.Skygofree.zip
similarity index 100%
rename from malwares/Binaries/Android.Skygofree/SkyGoFree.zip
rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.zip
diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.md5 b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.md5
similarity index 100%
rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.md5
rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.md5
diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.pass b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.pass
similarity index 100%
rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.pass
rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.pass
diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.sha256 b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.sha256
similarity index 100%
rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.sha256
rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.sha256
diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.zip b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.zip
similarity index 100%
rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.zip
rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.zip
diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.md5 b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.md5
similarity index 100%
rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.md5
rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.md5
diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.pass b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.pass
similarity index 100%
rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.pass
rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.pass
diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.sha b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.sha
similarity index 100%
rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.sha
rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.sha
diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.zip b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.zip
similarity index 100%
rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.zip
rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.zip
diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.md5 b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.md5
similarity index 100%
rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.md5
rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.md5
diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.pass b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.pass
similarity index 100%
rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.pass
rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.pass
diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.sha256 b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.sha256
similarity index 100%
rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.sha256
rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.sha256
diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.zip b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.zip
similarity index 100%
rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.zip
rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.zip
diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.md5 b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.md5
similarity index 100%
rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.md5
rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.md5
diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.pass b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.pass
similarity index 100%
rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.pass
rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.pass
diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.sha256 b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.sha256
similarity index 100%
rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.sha256
rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.sha256
diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.zip b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.zip
similarity index 100%
rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.zip
rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.zip
diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.md5 b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.md5
similarity index 100%
rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.md5
rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.md5
diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.pass b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.pass
similarity index 100%
rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.pass
rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.pass
diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.sha256 b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.sha256
similarity index 100%
rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.sha256
rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.sha256
diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.zip b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.zip
similarity index 100%
rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.zip
rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.zip
diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.md5 b/malwares/Binaries/Win32.Reveton/Win32.Reveton.md5
similarity index 100%
rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.md5
rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.md5
diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.pass b/malwares/Binaries/Win32.Reveton/Win32.Reveton.pass
similarity index 100%
rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.pass
rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.pass
diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.sha256 b/malwares/Binaries/Win32.Reveton/Win32.Reveton.sha256
similarity index 100%
rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.sha256
rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.sha256
diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.zip b/malwares/Binaries/Win32.Reveton/Win32.Reveton.zip
similarity index 100%
rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.zip
rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.zip
diff --git a/malwares/Binaries/Win32.XAgent/Win32.XAgent.bin.zip b/malwares/Binaries/Win32.XAgent/Win32.XAgent.zip
similarity index 100%
rename from malwares/Binaries/Win32.XAgent/Win32.XAgent.bin.zip
rename to malwares/Binaries/Win32.XAgent/Win32.XAgent.zip
diff --git a/malwares/Binaries/ZeusVM/ZeusVM.md5 b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.md5
similarity index 100%
rename from malwares/Binaries/ZeusVM/ZeusVM.md5
rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.md5
diff --git a/malwares/Binaries/ZeusVM/ZeusVM.pass b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.pass
similarity index 100%
rename from malwares/Binaries/ZeusVM/ZeusVM.pass
rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.pass
diff --git a/malwares/Binaries/ZeusVM/ZeusVM.sha256 b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.sha256
similarity index 100%
rename from malwares/Binaries/ZeusVM/ZeusVM.sha256
rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.sha256
diff --git a/malwares/Binaries/ZeusVM/ZeusVM.zip b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.zip
similarity index 100%
rename from malwares/Binaries/ZeusVM/ZeusVM.zip
rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.zip