Moved scripts to it's folder, JS cleanup