Modified reporter folder structure, removed some unused files