Removing extraneous prefix from add-source path
Updating targets