Fix directory name, add target-dir