refactored delivery files