Split Java code - note *will* compile but *will not* pass tests due to orm not yet configured for conceptreview