updated the synchronous/war engine impl and refactored/renamed a number of classes