Add reporter
Move to packages