Adding winfirewall module and moving stuff around