Move reporters to reporter package

Updated code to move reporters into the correct package.
@kengoodhope