removed upload data hierchy, now all 1 level