Move and fix files