Added CreateVendor, changed some folder structures