Electric Engine, Turbo Engine refactor