moved #report to a class method
reorganized into two folders