Updated Directory class, fixed issues, renamed.