Ensured that external files are not needed, and fixed dir name