Move accept utils into main utils
Combine multipart utils with main utils
Consolidate utils and update tests