Add generic reportstore
Remove GenericReportStore.py~