add/refactor delivery model to cater for both ug and pg
update import sites statement to use new ug format