Rearanged and moved things to the vendor files