OP-421 Convert Groovy to Java
Reorganized Domain Java code based on tailgate from this morning's stand-up