Some cleaning
Fix target-dir