Restored the reporting classes and moved trigger.py