fix and files moved