update directory structure and use cwd instead of path concatenation