lots of changes to Watir files and folders