Moved files to be more consistently named. Updated appropriate
references.