8-24 change

Now works with source file names that include paths