Some files arranging & doing my best to fix adv scannners bug