Move files where they should be