More improvements, renaming main .js file