Commit 2

Updated file names and references.