Fixed vendor file re-org