added aws image hosting
consolidated uploaders