updated folder structure, added collector to isolate handling of report data, removed most non-verbose logging