Moved and updated/merged js file.