Fixed directories in scripts
Added return to original directory