Upload script moved and improved