re-organize files and fix their paths