Moved and modified SelfReportController.java to deal with .com to .org change