re organise upload and test folder