Refactoring HW initial upload