Gave evaluateJavaScript an extra param of path

Added another parameter to evaluateJavaScript in ScriptHelper to enable
evaluating of scripts from more than just one location
Quick cleaning up of code

Removed, renamed and refactored a few things