Large refactoring + addition of items related to malware configuration