Finishes support for selenium, refactors service package