diff --git a/deprecated/Android_ASSDdeveloper.yar b/deprecated/Android/Android_ASSDdeveloper.yar
similarity index 100%
rename from deprecated/Android_ASSDdeveloper.yar
rename to deprecated/Android/Android_ASSDdeveloper.yar
diff --git a/deprecated/Android_AVITOMMS.yar b/deprecated/Android/Android_AVITOMMS.yar
similarity index 100%
rename from deprecated/Android_AVITOMMS.yar
rename to deprecated/Android/Android_AVITOMMS.yar
diff --git a/deprecated/Android_AliPay_smsStealer.yar b/deprecated/Android/Android_AliPay_smsStealer.yar
similarity index 100%
rename from deprecated/Android_AliPay_smsStealer.yar
rename to deprecated/Android/Android_AliPay_smsStealer.yar
diff --git a/deprecated/Android_Amtrckr_20160519.yar b/deprecated/Android/Android_Amtrckr_20160519.yar
similarity index 100%
rename from deprecated/Android_Amtrckr_20160519.yar
rename to deprecated/Android/Android_Amtrckr_20160519.yar
diff --git a/deprecated/Android_Backdoor.yar b/deprecated/Android/Android_Backdoor.yar
similarity index 100%
rename from deprecated/Android_Backdoor.yar
rename to deprecated/Android/Android_Backdoor.yar
diff --git a/deprecated/Android_Backdoor_script.yar b/deprecated/Android/Android_Backdoor_script.yar
similarity index 100%
rename from deprecated/Android_Backdoor_script.yar
rename to deprecated/Android/Android_Backdoor_script.yar
diff --git a/deprecated/Android_BadMirror.yar b/deprecated/Android/Android_BadMirror.yar
similarity index 100%
rename from deprecated/Android_BadMirror.yar
rename to deprecated/Android/Android_BadMirror.yar
diff --git a/deprecated/Android_Banker_Acecard.yar b/deprecated/Android/Android_Banker_Acecard.yar
similarity index 100%
rename from deprecated/Android_Banker_Acecard.yar
rename to deprecated/Android/Android_Banker_Acecard.yar
diff --git a/deprecated/Android_BatteryBot_ClickFraud.yar b/deprecated/Android/Android_BatteryBot_ClickFraud.yar
similarity index 100%
rename from deprecated/Android_BatteryBot_ClickFraud.yar
rename to deprecated/Android/Android_BatteryBot_ClickFraud.yar
diff --git a/deprecated/Android_Clicker_G.yar b/deprecated/Android/Android_Clicker_G.yar
similarity index 100%
rename from deprecated/Android_Clicker_G.yar
rename to deprecated/Android/Android_Clicker_G.yar
diff --git a/deprecated/Android_Copy9.yar b/deprecated/Android/Android_Copy9.yar
similarity index 100%
rename from deprecated/Android_Copy9.yar
rename to deprecated/Android/Android_Copy9.yar
diff --git a/deprecated/Android_DeathRing.yar b/deprecated/Android/Android_DeathRing.yar
similarity index 100%
rename from deprecated/Android_DeathRing.yar
rename to deprecated/Android/Android_DeathRing.yar
diff --git a/deprecated/Android_Dectus_rswm.yar b/deprecated/Android/Android_Dectus_rswm.yar
similarity index 100%
rename from deprecated/Android_Dectus_rswm.yar
rename to deprecated/Android/Android_Dectus_rswm.yar
diff --git a/deprecated/Android_Dendroid_RAT.yar b/deprecated/Android/Android_Dendroid_RAT.yar
similarity index 100%
rename from deprecated/Android_Dendroid_RAT.yar
rename to deprecated/Android/Android_Dendroid_RAT.yar
diff --git a/deprecated/Android_Dogspectus.yar b/deprecated/Android/Android_Dogspectus.yar
similarity index 100%
rename from deprecated/Android_Dogspectus.yar
rename to deprecated/Android/Android_Dogspectus.yar
diff --git a/deprecated/Android_FakeApps.yar b/deprecated/Android/Android_FakeApps.yar
similarity index 100%
rename from deprecated/Android_FakeApps.yar
rename to deprecated/Android/Android_FakeApps.yar
diff --git a/deprecated/Android_FakeBank_Fanta.yar b/deprecated/Android/Android_FakeBank_Fanta.yar
similarity index 100%
rename from deprecated/Android_FakeBank_Fanta.yar
rename to deprecated/Android/Android_FakeBank_Fanta.yar
diff --git a/deprecated/Android_Finspy.yar b/deprecated/Android/Android_Finspy.yar
similarity index 100%
rename from deprecated/Android_Finspy.yar
rename to deprecated/Android/Android_Finspy.yar
diff --git a/deprecated/Android_Godless.yar b/deprecated/Android/Android_Godless.yar
similarity index 100%
rename from deprecated/Android_Godless.yar
rename to deprecated/Android/Android_Godless.yar
diff --git a/deprecated/Android_HackintTeam_Implant.yar b/deprecated/Android/Android_HackintTeam_Implant.yar
similarity index 100%
rename from deprecated/Android_HackintTeam_Implant.yar
rename to deprecated/Android/Android_HackintTeam_Implant.yar
diff --git a/deprecated/Android_Libyan_Scorpions.yar b/deprecated/Android/Android_Libyan_Scorpions.yar
similarity index 100%
rename from deprecated/Android_Libyan_Scorpions.yar
rename to deprecated/Android/Android_Libyan_Scorpions.yar
diff --git a/deprecated/Android_MalwareCertificates.yar b/deprecated/Android/Android_MalwareCertificates.yar
similarity index 100%
rename from deprecated/Android_MalwareCertificates.yar
rename to deprecated/Android/Android_MalwareCertificates.yar
diff --git a/deprecated/Android_Malware_Ramsonware.yar b/deprecated/Android/Android_Malware_Ramsonware.yar
similarity index 100%
rename from deprecated/Android_Malware_Ramsonware.yar
rename to deprecated/Android/Android_Malware_Ramsonware.yar
diff --git a/deprecated/Android_Malware_Tinhvan.yar b/deprecated/Android/Android_Malware_Tinhvan.yar
similarity index 100%
rename from deprecated/Android_Malware_Tinhvan.yar
rename to deprecated/Android/Android_Malware_Tinhvan.yar
diff --git a/deprecated/Android_Malware_Towelroot.yar b/deprecated/Android/Android_Malware_Towelroot.yar
similarity index 100%
rename from deprecated/Android_Malware_Towelroot.yar
rename to deprecated/Android/Android_Malware_Towelroot.yar
diff --git a/deprecated/Android_Marcher_2.yar b/deprecated/Android/Android_Marcher_2.yar
similarity index 100%
rename from deprecated/Android_Marcher_2.yar
rename to deprecated/Android/Android_Marcher_2.yar
diff --git a/deprecated/Android_MazarBot_z.yar b/deprecated/Android/Android_MazarBot_z.yar
similarity index 100%
rename from deprecated/Android_MazarBot_z.yar
rename to deprecated/Android/Android_MazarBot_z.yar
diff --git a/deprecated/Android_Metasploit.yar b/deprecated/Android/Android_Metasploit.yar
similarity index 100%
rename from deprecated/Android_Metasploit.yar
rename to deprecated/Android/Android_Metasploit.yar
diff --git a/deprecated/Android_Metasploit_Payload.yar b/deprecated/Android/Android_Metasploit_Payload.yar
similarity index 100%
rename from deprecated/Android_Metasploit_Payload.yar
rename to deprecated/Android/Android_Metasploit_Payload.yar
diff --git a/deprecated/Android_OmniRat.yar b/deprecated/Android/Android_OmniRat.yar
similarity index 100%
rename from deprecated/Android_OmniRat.yar
rename to deprecated/Android/Android_OmniRat.yar
diff --git a/deprecated/Android_Overlayer.yar b/deprecated/Android/Android_Overlayer.yar
similarity index 100%
rename from deprecated/Android_Overlayer.yar
rename to deprecated/Android/Android_Overlayer.yar
diff --git a/deprecated/Android_Pink_Locker.yar b/deprecated/Android/Android_Pink_Locker.yar
similarity index 100%
rename from deprecated/Android_Pink_Locker.yar
rename to deprecated/Android/Android_Pink_Locker.yar
diff --git a/deprecated/Android_Polish_Bankbot.yar b/deprecated/Android/Android_Polish_Bankbot.yar
similarity index 100%
rename from deprecated/Android_Polish_Bankbot.yar
rename to deprecated/Android/Android_Polish_Bankbot.yar
diff --git a/deprecated/Android_RuMMS.yar b/deprecated/Android/Android_RuMMS.yar
similarity index 100%
rename from deprecated/Android_RuMMS.yar
rename to deprecated/Android/Android_RuMMS.yar
diff --git a/deprecated/Android_SMSFraud.yar b/deprecated/Android/Android_SMSFraud.yar
similarity index 100%
rename from deprecated/Android_SMSFraud.yar
rename to deprecated/Android/Android_SMSFraud.yar
diff --git a/deprecated/Android_SandroRat.yar b/deprecated/Android/Android_SandroRat.yar
similarity index 100%
rename from deprecated/Android_SandroRat.yar
rename to deprecated/Android/Android_SandroRat.yar
diff --git a/deprecated/Android_SlemBunk.yar b/deprecated/Android/Android_SlemBunk.yar
similarity index 100%
rename from deprecated/Android_SlemBunk.yar
rename to deprecated/Android/Android_SlemBunk.yar
diff --git a/deprecated/Android_SpyAgent.yar b/deprecated/Android/Android_SpyAgent.yar
similarity index 100%
rename from deprecated/Android_SpyAgent.yar
rename to deprecated/Android/Android_SpyAgent.yar
diff --git a/deprecated/Android_SpyNote.yar b/deprecated/Android/Android_SpyNote.yar
similarity index 100%
rename from deprecated/Android_SpyNote.yar
rename to deprecated/Android/Android_SpyNote.yar
diff --git a/deprecated/Android_Spynet.yar b/deprecated/Android/Android_Spynet.yar
similarity index 100%
rename from deprecated/Android_Spynet.yar
rename to deprecated/Android/Android_Spynet.yar
diff --git a/deprecated/Android_Spywaller.yar b/deprecated/Android/Android_Spywaller.yar
similarity index 100%
rename from deprecated/Android_Spywaller.yar
rename to deprecated/Android/Android_Spywaller.yar
diff --git a/deprecated/Android_Switcher.yar b/deprecated/Android/Android_Switcher.yar
similarity index 100%
rename from deprecated/Android_Switcher.yar
rename to deprecated/Android/Android_Switcher.yar
diff --git a/deprecated/Android_Tachi.yar b/deprecated/Android/Android_Tachi.yar
similarity index 100%
rename from deprecated/Android_Tachi.yar
rename to deprecated/Android/Android_Tachi.yar
diff --git a/deprecated/Android_Tempting_Cedar_Spyware.yar b/deprecated/Android/Android_Tempting_Cedar_Spyware.yar
similarity index 100%
rename from deprecated/Android_Tempting_Cedar_Spyware.yar
rename to deprecated/Android/Android_Tempting_Cedar_Spyware.yar
diff --git a/deprecated/Android_Tordow.yar b/deprecated/Android/Android_Tordow.yar
similarity index 100%
rename from deprecated/Android_Tordow.yar
rename to deprecated/Android/Android_Tordow.yar
diff --git a/deprecated/Android_Triada_Banking.yar b/deprecated/Android/Android_Triada_Banking.yar
similarity index 100%
rename from deprecated/Android_Triada_Banking.yar
rename to deprecated/Android/Android_Triada_Banking.yar
diff --git a/deprecated/Android_Trojan_Dendroid.yar b/deprecated/Android/Android_Trojan_Dendroid.yar
similarity index 100%
rename from deprecated/Android_Trojan_Dendroid.yar
rename to deprecated/Android/Android_Trojan_Dendroid.yar
diff --git a/deprecated/Android_Trojan_Droidjack.yar b/deprecated/Android/Android_Trojan_Droidjack.yar
similarity index 100%
rename from deprecated/Android_Trojan_Droidjack.yar
rename to deprecated/Android/Android_Trojan_Droidjack.yar
diff --git a/deprecated/Android_VikingOrder.yar b/deprecated/Android/Android_VikingOrder.yar
similarity index 100%
rename from deprecated/Android_VikingOrder.yar
rename to deprecated/Android/Android_VikingOrder.yar
diff --git a/deprecated/Android_VirusPolicia.yar b/deprecated/Android/Android_VirusPolicia.yar
similarity index 100%
rename from deprecated/Android_VirusPolicia.yar
rename to deprecated/Android/Android_VirusPolicia.yar
diff --git a/deprecated/Android_adware.yar b/deprecated/Android/Android_adware.yar
similarity index 100%
rename from deprecated/Android_adware.yar
rename to deprecated/Android/Android_adware.yar
diff --git a/deprecated/Android_fake_mario_app b/deprecated/Android/Android_fake_mario_app
similarity index 100%
rename from deprecated/Android_fake_mario_app
rename to deprecated/Android/Android_fake_mario_app
diff --git a/deprecated/Android_generic_adware.yar b/deprecated/Android/Android_generic_adware.yar
similarity index 100%
rename from deprecated/Android_generic_adware.yar
rename to deprecated/Android/Android_generic_adware.yar
diff --git a/deprecated/Android_generic_smsfraud.yar b/deprecated/Android/Android_generic_smsfraud.yar
similarity index 100%
rename from deprecated/Android_generic_smsfraud.yar
rename to deprecated/Android/Android_generic_smsfraud.yar
diff --git a/deprecated/Android_malware_Advertising.yar b/deprecated/Android/Android_malware_Advertising.yar
similarity index 100%
rename from deprecated/Android_malware_Advertising.yar
rename to deprecated/Android/Android_malware_Advertising.yar
diff --git a/deprecated/Android_malware_ChinesePorn.yar b/deprecated/Android/Android_malware_ChinesePorn.yar
similarity index 100%
rename from deprecated/Android_malware_ChinesePorn.yar
rename to deprecated/Android/Android_malware_ChinesePorn.yar
diff --git a/deprecated/Android_malware_Dropper.yar b/deprecated/Android/Android_malware_Dropper.yar
similarity index 100%
rename from deprecated/Android_malware_Dropper.yar
rename to deprecated/Android/Android_malware_Dropper.yar
diff --git a/deprecated/Android_malware_Fake_MosKow.yar b/deprecated/Android/Android_malware_Fake_MosKow.yar
similarity index 100%
rename from deprecated/Android_malware_Fake_MosKow.yar
rename to deprecated/Android/Android_malware_Fake_MosKow.yar
diff --git a/deprecated/Android_malware_HackingTeam.yar b/deprecated/Android/Android_malware_HackingTeam.yar
similarity index 100%
rename from deprecated/Android_malware_HackingTeam.yar
rename to deprecated/Android/Android_malware_HackingTeam.yar
diff --git a/deprecated/Android_malware_SMSsender.yar b/deprecated/Android/Android_malware_SMSsender.yar
similarity index 100%
rename from deprecated/Android_malware_SMSsender.yar
rename to deprecated/Android/Android_malware_SMSsender.yar
diff --git a/deprecated/Android_malware_banker.yar b/deprecated/Android/Android_malware_banker.yar
similarity index 100%
rename from deprecated/Android_malware_banker.yar
rename to deprecated/Android/Android_malware_banker.yar
diff --git a/deprecated/Android_malware_xbot007.yar b/deprecated/Android/Android_malware_xbot007.yar
similarity index 100%
rename from deprecated/Android_malware_xbot007.yar
rename to deprecated/Android/Android_malware_xbot007.yar
diff --git a/deprecated/Android_mapin.yar b/deprecated/Android/Android_mapin.yar
similarity index 100%
rename from deprecated/Android_mapin.yar
rename to deprecated/Android/Android_mapin.yar
diff --git a/deprecated/Android_pornClicker.yar b/deprecated/Android/Android_pornClicker.yar
similarity index 100%
rename from deprecated/Android_pornClicker.yar
rename to deprecated/Android/Android_pornClicker.yar
diff --git a/deprecated/Android_sk_bankTr.yar b/deprecated/Android/Android_sk_bankTr.yar
similarity index 100%
rename from deprecated/Android_sk_bankTr.yar
rename to deprecated/Android/Android_sk_bankTr.yar
diff --git a/malware/MALW_Retefe.yar b/deprecated/Malware/MALW_Retefe.yar
similarity index 100%
rename from malware/MALW_Retefe.yar
rename to deprecated/Malware/MALW_Retefe.yar