Restructure Selenium