diff --git a/Win32/ExploitKit.0x88.7z b/Win32/ExploitKit/ExploitKit.0x88.7z similarity index 100% rename from Win32/ExploitKit.0x88.7z rename to Win32/ExploitKit/ExploitKit.0x88.7z diff --git a/Win32/ExploitKit.Blackhole.A.7z b/Win32/ExploitKit/ExploitKit.Blackhole.A.7z similarity index 100% rename from Win32/ExploitKit.Blackhole.A.7z rename to Win32/ExploitKit/ExploitKit.Blackhole.A.7z diff --git a/Win32/ExploitKit.Blackhole.B.7z b/Win32/ExploitKit/ExploitKit.Blackhole.B.7z similarity index 100% rename from Win32/ExploitKit.Blackhole.B.7z rename to Win32/ExploitKit/ExploitKit.Blackhole.B.7z diff --git a/Win32/ExploitKit.BleedingLife.B.7z b/Win32/ExploitKit/ExploitKit.BleedingLife.B.7z similarity index 100% rename from Win32/ExploitKit.BleedingLife.B.7z rename to Win32/ExploitKit/ExploitKit.BleedingLife.B.7z diff --git a/Win32/ExploitKit.CrimePack.3.1.3.7z b/Win32/ExploitKit/ExploitKit.CrimePack.3.1.3.7z similarity index 100% rename from Win32/ExploitKit.CrimePack.3.1.3.7z rename to Win32/ExploitKit/ExploitKit.CrimePack.3.1.3.7z diff --git a/Win32/ExploitKit.DemonHunter.7z b/Win32/ExploitKit/ExploitKit.DemonHunter.7z similarity index 100% rename from Win32/ExploitKit.DemonHunter.7z rename to Win32/ExploitKit/ExploitKit.DemonHunter.7z diff --git a/Win32/ExploitKit.Eleonore.1.4.4.7z b/Win32/ExploitKit/ExploitKit.Eleonore.1.4.4.7z similarity index 100% rename from Win32/ExploitKit.Eleonore.1.4.4.7z rename to Win32/ExploitKit/ExploitKit.Eleonore.1.4.4.7z diff --git a/Win32/I-worm.Icecubes.asm b/Win32/Infector/I-worm.Icecubes.asm similarity index 100% rename from Win32/I-worm.Icecubes.asm rename to Win32/Infector/I-worm.Icecubes.asm diff --git a/Win32/MonsterWorm.7z b/Win32/Infector/MonsterWorm.7z similarity index 100% rename from Win32/MonsterWorm.7z rename to Win32/Infector/MonsterWorm.7z diff --git a/Win32/Virus.Win32.Ming.asm b/Win32/Infector/Virus.Win32.Ming.asm similarity index 100% rename from Win32/Virus.Win32.Ming.asm rename to Win32/Infector/Virus.Win32.Ming.asm diff --git a/Win32/Win32.99WaysToDie.asm b/Win32/Infector/Win32.99WaysToDie.asm similarity index 100% rename from Win32/Win32.99WaysToDie.asm rename to Win32/Infector/Win32.99WaysToDie.asm diff --git a/Win32/Win32.Alicia.asm b/Win32/Infector/Win32.Alicia.asm similarity index 100% rename from Win32/Win32.Alicia.asm rename to Win32/Infector/Win32.Alicia.asm diff --git a/Win32/Win32.Alma.asm b/Win32/Infector/Win32.Alma.asm similarity index 100% rename from Win32/Win32.Alma.asm rename to Win32/Infector/Win32.Alma.asm diff --git a/Win32/Win32.Apathy.asm b/Win32/Infector/Win32.Apathy.asm similarity index 100% rename from Win32/Win32.Apathy.asm rename to Win32/Infector/Win32.Apathy.asm diff --git a/Win32/Win32.Aris.asm b/Win32/Infector/Win32.Aris.asm similarity index 100% rename from Win32/Win32.Aris.asm rename to Win32/Infector/Win32.Aris.asm diff --git a/Win32/Win32.Astrix.asm b/Win32/Infector/Win32.Astrix.asm similarity index 100% rename from Win32/Win32.Astrix.asm rename to Win32/Infector/Win32.Astrix.asm diff --git a/Win32/Win32.Atav.asm b/Win32/Infector/Win32.Atav.asm similarity index 100% rename from Win32/Win32.Atav.asm rename to Win32/Infector/Win32.Atav.asm diff --git a/Win32/Win32.Ataxia.asm b/Win32/Infector/Win32.Ataxia.asm similarity index 100% rename from Win32/Win32.Ataxia.asm rename to Win32/Infector/Win32.Ataxia.asm diff --git a/Win32/Win32.Beagle.7z b/Win32/Infector/Win32.Beagle.7z similarity index 100% rename from Win32/Win32.Beagle.7z rename to Win32/Infector/Win32.Beagle.7z diff --git a/Win32/Win32.Bebop.asm b/Win32/Infector/Win32.Bebop.asm similarity index 100% rename from Win32/Win32.Bebop.asm rename to Win32/Infector/Win32.Bebop.asm diff --git a/Win32/Win32.Benny.asm b/Win32/Infector/Win32.Benny.asm similarity index 100% rename from Win32/Win32.Benny.asm rename to Win32/Infector/Win32.Benny.asm diff --git a/Win32/Win32.Bodom.asm b/Win32/Infector/Win32.Bodom.asm similarity index 100% rename from Win32/Win32.Bodom.asm rename to Win32/Infector/Win32.Bodom.asm diff --git a/Win32/Win32.Bogus.4096.asm b/Win32/Infector/Win32.Bogus.4096.asm similarity index 100% rename from Win32/Win32.Bogus.4096.asm rename to Win32/Infector/Win32.Bogus.4096.asm diff --git a/Win32/Win32.Borges2.asm b/Win32/Infector/Win32.Borges2.asm similarity index 100% rename from Win32/Win32.Borges2.asm rename to Win32/Infector/Win32.Borges2.asm diff --git a/Win32/Win32.Broken_face.asm b/Win32/Infector/Win32.Broken_face.asm similarity index 100% rename from Win32/Win32.Broken_face.asm rename to Win32/Infector/Win32.Broken_face.asm diff --git a/Win32/Win32.Butterflies.asm b/Win32/Infector/Win32.Butterflies.asm similarity index 100% rename from Win32/Win32.Butterflies.asm rename to Win32/Infector/Win32.Butterflies.asm diff --git a/Win32/Win32.CJD.asm b/Win32/Infector/Win32.CJD.asm similarity index 100% rename from Win32/Win32.CJD.asm rename to Win32/Infector/Win32.CJD.asm diff --git a/Win32/Win32.Cabanas.2999.asm b/Win32/Infector/Win32.Cabanas.2999.asm similarity index 100% rename from Win32/Win32.Cabanas.2999.asm rename to Win32/Infector/Win32.Cabanas.2999.asm diff --git a/Win32/Win32.Carberp.7z b/Win32/Infector/Win32.Carberp.7z similarity index 100% rename from Win32/Win32.Carberp.7z rename to Win32/Infector/Win32.Carberp.7z diff --git a/Win32/Win32.Carume.asm b/Win32/Infector/Win32.Carume.asm similarity index 100% rename from Win32/Win32.Carume.asm rename to Win32/Infector/Win32.Carume.asm diff --git a/Win32/Win32.Ceel.a.asm b/Win32/Infector/Win32.Ceel.a.asm similarity index 100% rename from Win32/Win32.Ceel.a.asm rename to Win32/Infector/Win32.Ceel.a.asm diff --git a/Win32/Win32.Chthon.asm b/Win32/Infector/Win32.Chthon.asm similarity index 100% rename from Win32/Win32.Chthon.asm rename to Win32/Infector/Win32.Chthon.asm diff --git a/Win32/Win32.Cichosz.asm b/Win32/Infector/Win32.Cichosz.asm similarity index 100% rename from Win32/Win32.Cichosz.asm rename to Win32/Infector/Win32.Cichosz.asm diff --git a/Win32/Win32.Clear.asm b/Win32/Infector/Win32.Clear.asm similarity index 100% rename from Win32/Win32.Clear.asm rename to Win32/Infector/Win32.Clear.asm diff --git a/Win32/Win32.Cleevix.asm b/Win32/Infector/Win32.Cleevix.asm similarity index 100% rename from Win32/Win32.Cleevix.asm rename to Win32/Infector/Win32.Cleevix.asm diff --git a/Win32/Win32.Cocaine.asm b/Win32/Infector/Win32.Cocaine.asm similarity index 100% rename from Win32/Win32.Cocaine.asm rename to Win32/Infector/Win32.Cocaine.asm diff --git a/Win32/Win32.CodeHopper.Queen.b.7z b/Win32/Infector/Win32.CodeHopper.Queen.b.7z similarity index 100% rename from Win32/Win32.CodeHopper.Queen.b.7z rename to Win32/Infector/Win32.CodeHopper.Queen.b.7z diff --git a/Win32/Win32.Crash.asm b/Win32/Infector/Win32.Crash.asm similarity index 100% rename from Win32/Win32.Crash.asm rename to Win32/Infector/Win32.Crash.asm diff --git a/Win32/Win32.Crucio.asm b/Win32/Infector/Win32.Crucio.asm similarity index 100% rename from Win32/Win32.Crucio.asm rename to Win32/Infector/Win32.Crucio.asm diff --git a/Win32/Win32.Crypto.asm b/Win32/Infector/Win32.Crypto.asm similarity index 100% rename from Win32/Win32.Crypto.asm rename to Win32/Infector/Win32.Crypto.asm diff --git a/Win32/Win32.DDoS.asm b/Win32/Infector/Win32.DDoS.asm similarity index 100% rename from Win32/Win32.DDoS.asm rename to Win32/Infector/Win32.DDoS.asm diff --git a/Win32/Win32.Darling.asm b/Win32/Infector/Win32.Darling.asm similarity index 100% rename from Win32/Win32.Darling.asm rename to Win32/Infector/Win32.Darling.asm diff --git a/Win32/Win32.Demiurg.asm b/Win32/Infector/Win32.Demiurg.asm similarity index 100% rename from Win32/Win32.Demiurg.asm rename to Win32/Infector/Win32.Demiurg.asm diff --git a/Win32/Win32.Dengue.asm b/Win32/Infector/Win32.Dengue.asm similarity index 100% rename from Win32/Win32.Dengue.asm rename to Win32/Infector/Win32.Dengue.asm diff --git a/Win32/Win32.Diablerie.asm b/Win32/Infector/Win32.Diablerie.asm similarity index 100% rename from Win32/Win32.Diablerie.asm rename to Win32/Infector/Win32.Diablerie.asm diff --git a/Win32/Win32.Dream.asm b/Win32/Infector/Win32.Dream.asm similarity index 100% rename from Win32/Win32.Dream.asm rename to Win32/Infector/Win32.Dream.asm diff --git a/Win32/Win32.Efishnc.asm b/Win32/Infector/Win32.Efishnc.asm similarity index 100% rename from Win32/Win32.Efishnc.asm rename to Win32/Infector/Win32.Efishnc.asm diff --git a/Win32/Win32.Efishnc.b.asm b/Win32/Infector/Win32.Efishnc.b.asm similarity index 100% rename from Win32/Win32.Efishnc.b.asm rename to Win32/Infector/Win32.Efishnc.b.asm diff --git a/Win32/Win32.Efishnc.c.asm b/Win32/Infector/Win32.Efishnc.c.asm similarity index 100% rename from Win32/Win32.Efishnc.c.asm rename to Win32/Infector/Win32.Efishnc.c.asm diff --git a/Win32/Win32.Egypt.asm b/Win32/Infector/Win32.Egypt.asm similarity index 100% rename from Win32/Win32.Egypt.asm rename to Win32/Infector/Win32.Egypt.asm diff --git a/Win32/Win32.Elkern.c.asm b/Win32/Infector/Win32.Elkern.c.asm similarity index 100% rename from Win32/Win32.Elkern.c.asm rename to Win32/Infector/Win32.Elkern.c.asm diff --git a/Win32/Win32.Emotion.asm b/Win32/Infector/Win32.Emotion.asm similarity index 100% rename from Win32/Win32.Emotion.asm rename to Win32/Infector/Win32.Emotion.asm diff --git a/Win32/Win32.Enumero.asm b/Win32/Infector/Win32.Enumero.asm similarity index 100% rename from Win32/Win32.Enumero.asm rename to Win32/Infector/Win32.Enumero.asm diff --git a/Win32/Win32.Eva.asm b/Win32/Infector/Win32.Eva.asm similarity index 100% rename from Win32/Win32.Eva.asm rename to Win32/Infector/Win32.Eva.asm diff --git a/Win32/Win32.Fever.asm b/Win32/Infector/Win32.Fever.asm similarity index 100% rename from Win32/Win32.Fever.asm rename to Win32/Infector/Win32.Fever.asm diff --git a/Win32/Win32.Fly.asm b/Win32/Infector/Win32.Fly.asm similarity index 100% rename from Win32/Win32.Fly.asm rename to Win32/Infector/Win32.Fly.asm diff --git a/Win32/Win32.Foroux.a.asm b/Win32/Infector/Win32.Foroux.a.asm similarity index 100% rename from Win32/Win32.Foroux.a.asm rename to Win32/Infector/Win32.Foroux.a.asm diff --git a/Win32/Win32.Freebird.asm b/Win32/Infector/Win32.Freebird.asm similarity index 100% rename from Win32/Win32.Freebird.asm rename to Win32/Infector/Win32.Freebird.asm diff --git a/Win32/Win32.Ganja.c.7z b/Win32/Infector/Win32.Ganja.c.7z similarity index 100% rename from Win32/Win32.Ganja.c.7z rename to Win32/Infector/Win32.Ganja.c.7z diff --git a/Win32/Win32.Gaybar.asm b/Win32/Infector/Win32.Gaybar.asm similarity index 100% rename from Win32/Win32.Gaybar.asm rename to Win32/Infector/Win32.Gaybar.asm diff --git a/Win32/Win32.Gemini.asm b/Win32/Infector/Win32.Gemini.asm similarity index 100% rename from Win32/Win32.Gemini.asm rename to Win32/Infector/Win32.Gemini.asm diff --git a/Win32/Win32.Georgina.3657.asm b/Win32/Infector/Win32.Georgina.3657.asm similarity index 100% rename from Win32/Win32.Georgina.3657.asm rename to Win32/Infector/Win32.Georgina.3657.asm diff --git a/Win32/Win32.H0rtiga.asm b/Win32/Infector/Win32.H0rtiga.asm similarity index 100% rename from Win32/Win32.H0rtiga.asm rename to Win32/Infector/Win32.H0rtiga.asm diff --git a/Win32/Win32.Halen.asm b/Win32/Infector/Win32.Halen.asm similarity index 100% rename from Win32/Win32.Halen.asm rename to Win32/Infector/Win32.Halen.asm diff --git a/Win32/Win32.Harrier.asm b/Win32/Infector/Win32.Harrier.asm similarity index 100% rename from Win32/Win32.Harrier.asm rename to Win32/Infector/Win32.Harrier.asm diff --git a/Win32/Win32.Hatred.asm b/Win32/Infector/Win32.Hatred.asm similarity index 100% rename from Win32/Win32.Hatred.asm rename to Win32/Infector/Win32.Hatred.asm diff --git a/Win32/Win32.Heathen.asm b/Win32/Infector/Win32.Heathen.asm similarity index 100% rename from Win32/Win32.Heathen.asm rename to Win32/Infector/Win32.Heathen.asm diff --git a/Win32/Win32.HempHoper.asm b/Win32/Infector/Win32.HempHoper.asm similarity index 100% rename from Win32/Win32.HempHoper.asm rename to Win32/Infector/Win32.HempHoper.asm diff --git a/Win32/Win32.Heretic.asm b/Win32/Infector/Win32.Heretic.asm similarity index 100% rename from Win32/Win32.Heretic.asm rename to Win32/Infector/Win32.Heretic.asm diff --git a/Win32/Win32.Hiv.asm b/Win32/Infector/Win32.Hiv.asm similarity index 100% rename from Win32/Win32.Hiv.asm rename to Win32/Infector/Win32.Hiv.asm diff --git a/Win32/Win32.Hortiga.asm b/Win32/Infector/Win32.Hortiga.asm similarity index 100% rename from Win32/Win32.Hortiga.asm rename to Win32/Infector/Win32.Hortiga.asm diff --git a/Win32/Win32.Idele.asm b/Win32/Infector/Win32.Idele.asm similarity index 100% rename from Win32/Win32.Idele.asm rename to Win32/Infector/Win32.Idele.asm diff --git a/Win32/Win32.Idyll.1556.asm b/Win32/Infector/Win32.Idyll.1556.asm similarity index 100% rename from Win32/Win32.Idyll.1556.asm rename to Win32/Infector/Win32.Idyll.1556.asm diff --git a/Win32/Win32.Imports.asm b/Win32/Infector/Win32.Imports.asm similarity index 100% rename from Win32/Win32.Imports.asm rename to Win32/Infector/Win32.Imports.asm diff --git a/Win32/Win32.Infancy.asm b/Win32/Infector/Win32.Infancy.asm similarity index 100% rename from Win32/Win32.Infancy.asm rename to Win32/Infector/Win32.Infancy.asm diff --git a/Win32/Win32.Infinite.asm b/Win32/Infector/Win32.Infinite.asm similarity index 100% rename from Win32/Win32.Infinite.asm rename to Win32/Infector/Win32.Infinite.asm diff --git a/Win32/Win32.Isis.asm b/Win32/Infector/Win32.Isis.asm similarity index 100% rename from Win32/Win32.Isis.asm rename to Win32/Infector/Win32.Isis.asm diff --git a/Win32/Win32.Jacky.1440.asm b/Win32/Infector/Win32.Jacky.1440.asm similarity index 100% rename from Win32/Win32.Jacky.1440.asm rename to Win32/Infector/Win32.Jacky.1440.asm diff --git a/Win32/Win32.Jimmy.asm b/Win32/Infector/Win32.Jimmy.asm similarity index 100% rename from Win32/Win32.Jimmy.asm rename to Win32/Infector/Win32.Jimmy.asm diff --git a/Win32/Win32.JollyRoger.a.7z b/Win32/Infector/Win32.JollyRoger.a.7z similarity index 100% rename from Win32/Win32.JollyRoger.a.7z rename to Win32/Infector/Win32.JollyRoger.a.7z diff --git a/Win32/Win32.JollyRoger.b.7z b/Win32/Infector/Win32.JollyRoger.b.7z similarity index 100% rename from Win32/Win32.JollyRoger.b.7z rename to Win32/Infector/Win32.JollyRoger.b.7z diff --git a/Win32/Win32.JunkMail.7z b/Win32/Infector/Win32.JunkMail.7z similarity index 100% rename from Win32/Win32.JunkMail.7z rename to Win32/Infector/Win32.JunkMail.7z diff --git a/Win32/Win32.Junkhtmail.asm b/Win32/Infector/Win32.Junkhtmail.asm similarity index 100% rename from Win32/Win32.Junkhtmail.asm rename to Win32/Infector/Win32.Junkhtmail.asm diff --git a/Win32/Win32.KaZaM.asm b/Win32/Infector/Win32.KaZaM.asm similarity index 100% rename from Win32/Win32.KaZaM.asm rename to Win32/Infector/Win32.KaZaM.asm diff --git a/Win32/Win32.Karazakira.asm b/Win32/Infector/Win32.Karazakira.asm similarity index 100% rename from Win32/Win32.Karazakira.asm rename to Win32/Infector/Win32.Karazakira.asm diff --git a/Win32/Win32.Kenston.asm b/Win32/Infector/Win32.Kenston.asm similarity index 100% rename from Win32/Win32.Kenston.asm rename to Win32/Infector/Win32.Kenston.asm diff --git a/Win32/Win32.Kriz.asm b/Win32/Infector/Win32.Kriz.asm similarity index 100% rename from Win32/Win32.Kriz.asm rename to Win32/Infector/Win32.Kriz.asm diff --git a/Win32/Win32.LadyMarian.2.asm b/Win32/Infector/Win32.LadyMarian.2.asm similarity index 100% rename from Win32/Win32.LadyMarian.2.asm rename to Win32/Infector/Win32.LadyMarian.2.asm diff --git a/Win32/Win32.LaraCroft.asm b/Win32/Infector/Win32.LaraCroft.asm similarity index 100% rename from Win32/Win32.LaraCroft.asm rename to Win32/Infector/Win32.LaraCroft.asm diff --git a/Win32/Win32.Legacy.asm b/Win32/Infector/Win32.Legacy.asm similarity index 100% rename from Win32/Win32.Legacy.asm rename to Win32/Infector/Win32.Legacy.asm diff --git a/Win32/Win32.Leviathan.asm b/Win32/Infector/Win32.Leviathan.asm similarity index 100% rename from Win32/Win32.Leviathan.asm rename to Win32/Infector/Win32.Leviathan.asm diff --git a/Win32/Win32.Linda.asm b/Win32/Infector/Win32.Linda.asm similarity index 100% rename from Win32/Win32.Linda.asm rename to Win32/Infector/Win32.Linda.asm diff --git a/Win32/Win32.Magic.7045.asm b/Win32/Infector/Win32.Magic.7045.asm similarity index 100% rename from Win32/Win32.Magic.7045.asm rename to Win32/Infector/Win32.Magic.7045.asm diff --git a/Win32/Win32.Mates.asm b/Win32/Infector/Win32.Mates.asm similarity index 100% rename from Win32/Win32.Mates.asm rename to Win32/Infector/Win32.Mates.asm diff --git a/Win32/Win32.Maya.4153.asm b/Win32/Infector/Win32.Maya.4153.asm similarity index 100% rename from Win32/Win32.Maya.4153.asm rename to Win32/Infector/Win32.Maya.4153.asm diff --git a/Win32/Win32.Maya.asm b/Win32/Infector/Win32.Maya.asm similarity index 100% rename from Win32/Win32.Maya.asm rename to Win32/Infector/Win32.Maya.asm diff --git a/Win32/Win32.Mescaline.asm b/Win32/Infector/Win32.Mescaline.asm similarity index 100% rename from Win32/Win32.Mescaline.asm rename to Win32/Infector/Win32.Mescaline.asm diff --git a/Win32/Win32.Metaphor.asm b/Win32/Infector/Win32.Metaphor.asm similarity index 100% rename from Win32/Win32.Metaphor.asm rename to Win32/Infector/Win32.Metaphor.asm diff --git a/Win32/Win32.Morw.asm b/Win32/Infector/Win32.Morw.asm similarity index 100% rename from Win32/Win32.Morw.asm rename to Win32/Infector/Win32.Morw.asm diff --git a/Win32/Win32.Mutt.asm b/Win32/Infector/Win32.Mutt.asm similarity index 100% rename from Win32/Win32.Mutt.asm rename to Win32/Infector/Win32.Mutt.asm diff --git a/Win32/Win32.Nachtklinge.asm b/Win32/Infector/Win32.Nachtklinge.asm similarity index 100% rename from Win32/Win32.Nachtklinge.asm rename to Win32/Infector/Win32.Nachtklinge.asm diff --git a/Win32/Win32.Neo.asm b/Win32/Infector/Win32.Neo.asm similarity index 100% rename from Win32/Win32.Neo.asm rename to Win32/Infector/Win32.Neo.asm diff --git a/Win32/Win32.Norther.ASM b/Win32/Infector/Win32.Norther.ASM similarity index 100% rename from Win32/Win32.Norther.ASM rename to Win32/Infector/Win32.Norther.ASM diff --git a/Win32/Win32.Omoikane.asm b/Win32/Infector/Win32.Omoikane.asm similarity index 100% rename from Win32/Win32.Omoikane.asm rename to Win32/Infector/Win32.Omoikane.asm diff --git a/Win32/Win32.Orange.asm b/Win32/Infector/Win32.Orange.asm similarity index 100% rename from Win32/Win32.Orange.asm rename to Win32/Infector/Win32.Orange.asm diff --git a/Win32/Win32.Ordy.asm b/Win32/Infector/Win32.Ordy.asm similarity index 100% rename from Win32/Win32.Ordy.asm rename to Win32/Infector/Win32.Ordy.asm diff --git a/Win32/Win32.Paradise.asm b/Win32/Infector/Win32.Paradise.asm similarity index 100% rename from Win32/Win32.Paradise.asm rename to Win32/Infector/Win32.Paradise.asm diff --git a/Win32/Win32.Parrot.asm b/Win32/Infector/Win32.Parrot.asm similarity index 100% rename from Win32/Win32.Parrot.asm rename to Win32/Infector/Win32.Parrot.asm diff --git a/Win32/Win32.Pitagora.asm b/Win32/Infector/Win32.Pitagora.asm similarity index 100% rename from Win32/Win32.Pitagora.asm rename to Win32/Infector/Win32.Pitagora.asm diff --git a/Win32/Win32.Plexar.asm b/Win32/Infector/Win32.Plexar.asm similarity index 100% rename from Win32/Win32.Plexar.asm rename to Win32/Infector/Win32.Plexar.asm diff --git a/Win32/Win32.PolutoSP.asm b/Win32/Infector/Win32.PolutoSP.asm similarity index 100% rename from Win32/Win32.PolutoSP.asm rename to Win32/Infector/Win32.PolutoSP.asm diff --git a/Win32/Win32.Project2501.asm b/Win32/Infector/Win32.Project2501.asm similarity index 100% rename from Win32/Win32.Project2501.asm rename to Win32/Infector/Win32.Project2501.asm diff --git a/Win32/Win32.Rainsong.asm b/Win32/Infector/Win32.Rainsong.asm similarity index 100% rename from Win32/Win32.Rainsong.asm rename to Win32/Infector/Win32.Rainsong.asm diff --git a/Win32/Win32.Rammstien.asm b/Win32/Infector/Win32.Rammstien.asm similarity index 100% rename from Win32/Win32.Rammstien.asm rename to Win32/Infector/Win32.Rammstien.asm diff --git a/Win32/Win32.Redemption.9216.asm b/Win32/Infector/Win32.Redemption.9216.asm similarity index 100% rename from Win32/Win32.Redemption.9216.asm rename to Win32/Infector/Win32.Redemption.9216.asm diff --git a/Win32/Win32.Resurrection.asm b/Win32/Infector/Win32.Resurrection.asm similarity index 100% rename from Win32/Win32.Resurrection.asm rename to Win32/Infector/Win32.Resurrection.asm diff --git a/Win32/Win32.Rivanon.asm b/Win32/Infector/Win32.Rivanon.asm similarity index 100% rename from Win32/Win32.Rivanon.asm rename to Win32/Infector/Win32.Rivanon.asm diff --git a/Win32/Win32.RousSarcoma.asm b/Win32/Infector/Win32.RousSarcoma.asm similarity index 100% rename from Win32/Win32.RousSarcoma.asm rename to Win32/Infector/Win32.RousSarcoma.asm diff --git a/Win32/Win32.Rudra.asm b/Win32/Infector/Win32.Rudra.asm similarity index 100% rename from Win32/Win32.Rudra.asm rename to Win32/Infector/Win32.Rudra.asm diff --git a/Win32/Win32.Sabia.asm b/Win32/Infector/Win32.Sabia.asm similarity index 100% rename from Win32/Win32.Sabia.asm rename to Win32/Infector/Win32.Sabia.asm diff --git a/Win32/Win32.Savior.asm b/Win32/Infector/Win32.Savior.asm similarity index 100% rename from Win32/Win32.Savior.asm rename to Win32/Infector/Win32.Savior.asm diff --git a/Win32/Win32.Screenfector.asm b/Win32/Infector/Win32.Screenfector.asm similarity index 100% rename from Win32/Win32.Screenfector.asm rename to Win32/Infector/Win32.Screenfector.asm diff --git a/Win32/Win32.SecondArrow.asm b/Win32/Infector/Win32.SecondArrow.asm similarity index 100% rename from Win32/Win32.SecondArrow.asm rename to Win32/Infector/Win32.SecondArrow.asm diff --git a/Win32/Win32.Seiryo.asm b/Win32/Infector/Win32.Seiryo.asm similarity index 100% rename from Win32/Win32.Seiryo.asm rename to Win32/Infector/Win32.Seiryo.asm diff --git a/Win32/Win32.Seraph.asm b/Win32/Infector/Win32.Seraph.asm similarity index 100% rename from Win32/Win32.Seraph.asm rename to Win32/Infector/Win32.Seraph.asm diff --git a/Win32/Win32.Shaitan.asm b/Win32/Infector/Win32.Shaitan.asm similarity index 100% rename from Win32/Win32.Shaitan.asm rename to Win32/Infector/Win32.Shaitan.asm diff --git a/Win32/Win32.Shithead.asm b/Win32/Infector/Win32.Shithead.asm similarity index 100% rename from Win32/Win32.Shithead.asm rename to Win32/Infector/Win32.Shithead.asm diff --git a/Win32/Win32.Shrug.asm b/Win32/Infector/Win32.Shrug.asm similarity index 100% rename from Win32/Win32.Shrug.asm rename to Win32/Infector/Win32.Shrug.asm diff --git a/Win32/Win32.Simple.asm b/Win32/Infector/Win32.Simple.asm similarity index 100% rename from Win32/Win32.Simple.asm rename to Win32/Infector/Win32.Simple.asm diff --git a/Win32/Win32.Smog.asm b/Win32/Infector/Win32.Smog.asm similarity index 100% rename from Win32/Win32.Smog.asm rename to Win32/Infector/Win32.Smog.asm diff --git a/Win32/Win32.Spit.asm b/Win32/Infector/Win32.Spit.asm similarity index 100% rename from Win32/Win32.Spit.asm rename to Win32/Infector/Win32.Spit.asm diff --git a/Win32/Win32.Ston.asm b/Win32/Infector/Win32.Ston.asm similarity index 100% rename from Win32/Win32.Ston.asm rename to Win32/Infector/Win32.Ston.asm diff --git a/Win32/Win32.Tenrobot.7z b/Win32/Infector/Win32.Tenrobot.7z similarity index 100% rename from Win32/Win32.Tenrobot.7z rename to Win32/Infector/Win32.Tenrobot.7z diff --git a/Win32/Win32.ThanksToDarwin.asm b/Win32/Infector/Win32.ThanksToDarwin.asm similarity index 100% rename from Win32/Win32.ThanksToDarwin.asm rename to Win32/Infector/Win32.ThanksToDarwin.asm diff --git a/Win32/Win32.Thorin.asm b/Win32/Infector/Win32.Thorin.asm similarity index 100% rename from Win32/Win32.Thorin.asm rename to Win32/Infector/Win32.Thorin.asm diff --git a/Win32/Win32.Tirthas.asm b/Win32/Infector/Win32.Tirthas.asm similarity index 100% rename from Win32/Win32.Tirthas.asm rename to Win32/Infector/Win32.Tirthas.asm diff --git a/Win32/Win32.Tuareg.asm b/Win32/Infector/Win32.Tuareg.asm similarity index 100% rename from Win32/Win32.Tuareg.asm rename to Win32/Infector/Win32.Tuareg.asm diff --git a/Win32/Win32.Urk0.asm b/Win32/Infector/Win32.Urk0.asm similarity index 100% rename from Win32/Win32.Urk0.asm rename to Win32/Infector/Win32.Urk0.asm diff --git a/Win32/Win32.Vampiro.2883.asm b/Win32/Infector/Win32.Vampiro.2883.asm similarity index 100% rename from Win32/Win32.Vampiro.2883.asm rename to Win32/Infector/Win32.Vampiro.2883.asm diff --git a/Win32/Win32.Vampiro.7018.asm b/Win32/Infector/Win32.Vampiro.7018.asm similarity index 100% rename from Win32/Win32.Vampiro.7018.asm rename to Win32/Infector/Win32.Vampiro.7018.asm diff --git a/Win32/Win32.Voltage.asm b/Win32/Infector/Win32.Voltage.asm similarity index 100% rename from Win32/Win32.Voltage.asm rename to Win32/Infector/Win32.Voltage.asm diff --git a/Win32/Win32.Voodoo.asm b/Win32/Infector/Win32.Voodoo.asm similarity index 100% rename from Win32/Win32.Voodoo.asm rename to Win32/Infector/Win32.Voodoo.asm diff --git a/Win32/Win32.Vulcano.asm b/Win32/Infector/Win32.Vulcano.asm similarity index 100% rename from Win32/Win32.Vulcano.asm rename to Win32/Infector/Win32.Vulcano.asm diff --git a/Win32/Win32.Waber.asm b/Win32/Infector/Win32.Waber.asm similarity index 100% rename from Win32/Win32.Waber.asm rename to Win32/Infector/Win32.Waber.asm diff --git a/Win32/Win32.Winux.asm b/Win32/Infector/Win32.Winux.asm similarity index 100% rename from Win32/Win32.Winux.asm rename to Win32/Infector/Win32.Winux.asm diff --git a/Win32/Win32.WolfHeart.asm b/Win32/Infector/Win32.WolfHeart.asm similarity index 100% rename from Win32/Win32.WolfHeart.asm rename to Win32/Infector/Win32.WolfHeart.asm diff --git a/Win32/Win32.Zeus.a.7z b/Win32/Infector/Win32.Zeus.a.7z similarity index 100% rename from Win32/Win32.Zeus.a.7z rename to Win32/Infector/Win32.Zeus.a.7z diff --git a/Win32/Win32.Zipling.asm b/Win32/Infector/Win32.Zipling.asm similarity index 100% rename from Win32/Win32.Zipling.asm rename to Win32/Infector/Win32.Zipling.asm diff --git a/Win32/Win32.borges.asm b/Win32/Infector/Win32.borges.asm similarity index 100% rename from Win32/Win32.borges.asm rename to Win32/Infector/Win32.borges.asm diff --git a/Win32/Win64.Shrug.7z b/Win32/Infector/Win64.Shrug.7z similarity index 100% rename from Win32/Win64.Shrug.7z rename to Win32/Infector/Win64.Shrug.7z diff --git a/Win32/WinHLP.Pluma.txt b/Win32/Infector/WinHLP.Pluma.txt similarity index 100% rename from Win32/WinHLP.Pluma.txt rename to Win32/Infector/WinHLP.Pluma.txt diff --git a/Win32/I-Worm.Alizee.asm b/Win32/InternetWorm/I-Worm.Alizee.asm similarity index 100% rename from Win32/I-Worm.Alizee.asm rename to Win32/InternetWorm/I-Worm.Alizee.asm diff --git a/Win32/I-Worm.Archiver.c b/Win32/InternetWorm/I-Worm.Archiver.c similarity index 100% rename from Win32/I-Worm.Archiver.c rename to Win32/InternetWorm/I-Worm.Archiver.c diff --git a/Win32/I-Worm.BigBrother.asm b/Win32/InternetWorm/I-Worm.BigBrother.asm similarity index 100% rename from Win32/I-Worm.BigBrother.asm rename to Win32/InternetWorm/I-Worm.BigBrother.asm diff --git a/Win32/I-Worm.Casper.asm b/Win32/InternetWorm/I-Worm.Casper.asm similarity index 100% rename from Win32/I-Worm.Casper.asm rename to Win32/InternetWorm/I-Worm.Casper.asm diff --git a/Win32/I-Worm.Chainsaw.asm b/Win32/InternetWorm/I-Worm.Chainsaw.asm similarity index 100% rename from Win32/I-Worm.Chainsaw.asm rename to Win32/InternetWorm/I-Worm.Chainsaw.asm diff --git a/Win32/I-Worm.Energy.asm b/Win32/InternetWorm/I-Worm.Energy.asm similarity index 100% rename from Win32/I-Worm.Energy.asm rename to Win32/InternetWorm/I-Worm.Energy.asm diff --git a/Win32/I-Worm.Extract.asm b/Win32/InternetWorm/I-Worm.Extract.asm similarity index 100% rename from Win32/I-Worm.Extract.asm rename to Win32/InternetWorm/I-Worm.Extract.asm diff --git a/Win32/I-Worm.Haram.asm b/Win32/InternetWorm/I-Worm.Haram.asm similarity index 100% rename from Win32/I-Worm.Haram.asm rename to Win32/InternetWorm/I-Worm.Haram.asm diff --git a/Win32/I-Worm.Japanize.asm b/Win32/InternetWorm/I-Worm.Japanize.asm similarity index 100% rename from Win32/I-Worm.Japanize.asm rename to Win32/InternetWorm/I-Worm.Japanize.asm diff --git a/Win32/I-Worm.Kevlar.asm b/Win32/InternetWorm/I-Worm.Kevlar.asm similarity index 100% rename from Win32/I-Worm.Kevlar.asm rename to Win32/InternetWorm/I-Worm.Kevlar.asm diff --git a/Win32/I-Worm.M4&VR.asm b/Win32/InternetWorm/I-Worm.M4&VR.asm similarity index 100% rename from Win32/I-Worm.M4&VR.asm rename to Win32/InternetWorm/I-Worm.M4&VR.asm diff --git a/Win32/I-Worm.MaLoTeYa.asm b/Win32/InternetWorm/I-Worm.MaLoTeYa.asm similarity index 100% rename from Win32/I-Worm.MaLoTeYa.asm rename to Win32/InternetWorm/I-Worm.MaLoTeYa.asm diff --git a/Win32/I-Worm.MadCow.asm b/Win32/InternetWorm/I-Worm.MadCow.asm similarity index 100% rename from Win32/I-Worm.MadCow.asm rename to Win32/InternetWorm/I-Worm.MadCow.asm diff --git a/Win32/I-Worm.PieceByPiece.c b/Win32/InternetWorm/I-Worm.PieceByPiece.c similarity index 100% rename from Win32/I-Worm.PieceByPiece.c rename to Win32/InternetWorm/I-Worm.PieceByPiece.c diff --git a/Win32/I-Worm.Pilif.7z b/Win32/InternetWorm/I-Worm.Pilif.7z similarity index 100% rename from Win32/I-Worm.Pilif.7z rename to Win32/InternetWorm/I-Worm.Pilif.7z diff --git a/Win32/I-Worm.Rush.asm b/Win32/InternetWorm/I-Worm.Rush.asm similarity index 100% rename from Win32/I-Worm.Rush.asm rename to Win32/InternetWorm/I-Worm.Rush.asm diff --git a/Win32/I-Worm.SingLung.c b/Win32/InternetWorm/I-Worm.SingLung.c similarity index 100% rename from Win32/I-Worm.SingLung.c rename to Win32/InternetWorm/I-Worm.SingLung.c diff --git a/Win32/I-Worm.Together.asm b/Win32/InternetWorm/I-Worm.Together.asm similarity index 100% rename from Win32/I-Worm.Together.asm rename to Win32/InternetWorm/I-Worm.Together.asm diff --git a/Win32/I-Worm.Twin.asm b/Win32/InternetWorm/I-Worm.Twin.asm similarity index 100% rename from Win32/I-Worm.Twin.asm rename to Win32/InternetWorm/I-Worm.Twin.asm diff --git a/Win32/I-Worm.WarGames.c b/Win32/InternetWorm/I-Worm.WarGames.c similarity index 100% rename from Win32/I-Worm.WarGames.c rename to Win32/InternetWorm/I-Worm.WarGames.c diff --git a/Win32/I-Worm.Win9x.Troodon.asm b/Win32/InternetWorm/I-Worm.Win9x.Troodon.asm similarity index 100% rename from Win32/I-Worm.Win9x.Troodon.asm rename to Win32/InternetWorm/I-Worm.Win9x.Troodon.asm diff --git a/Win32/I-Worm.XTC.asm b/Win32/InternetWorm/I-Worm.XTC.asm similarity index 100% rename from Win32/I-Worm.XTC.asm rename to Win32/InternetWorm/I-Worm.XTC.asm