improve folder creation & upload