Moved java objects into com.evm.model