Code reorganization
Improved upload dialog
Upload dialog allows choosing targets