removing target dir, adding patch support