added cwd, dir reorganize