fixing bugs with directory structure and adding support for dput