Minor cleanup and moved /src/scripts/targets to /src/targets.