moved and renamed files, fixed references to files