create reporting package
Moved view models
Replace some static classes with dynamic classes