Files moved, references updated