Amazon upload refactor