Refactoring changes

Updated data structure to include deliveries. Multiple models have been deleted and altered.