restructured the files into a simpler format, still keeping log objects and firewall config in this