Merge reorganize_code into develop

Rather than relying on a funtion to generate the whole reporting, we'd better generate values that can be fed to the JSON, PDF, etc. report generators.