Refactored Report Classes, and moved/renamed Zach's Code.
Added Zach's code to the Java project.