Simplify, clean up and tidy TargetDirectory.