merge all delivery code into a single file
merge all retrieval code into a single file