fixed file references
lots of renames