Updating templates to use TARGET_DIR instead of hardcoding