Fixed output files, cleanup stock suricata locations
Working with new suricata-2.0.2