JBIDE-15302 CordovaSim: Refactoring