fixed link to source files, cleans up better
rebuilt test project v2